Martin von Zweigbergk 443528159e conflicts: use new multi-way diff for materialized multi-way conflicts ... This copies the conflict marker format I added a while ago to Mercurial (https://phab.mercurial-scm.org/D9551), except that it uses `+++++++` instead of `=======` for sections that are pure adds. The reason I made that change is because we also have support for pure removes (Mercurial never ends up in that situation because it has exactly one remove and two adds). This change resolves part of issue #19.		2021-06-30 12:29:20 -07:00
..
benches
protos
src	conflicts: use new multi-way diff for materialized multi-way conflicts	2021-06-30 12:29:20 -07:00
tests	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
build.rs
Cargo.toml	cargo: update test-case to 1.2.0 now that frondeus/test-case#66 is fixed	2021-06-28 12:13:14 -07:00