Martin von Zweigbergk 3f95dafd67 conflicts: resolve trivial merge of A+A-B+C-C to A ... This changes the behavior in one of the cases ilyagr@ [mentioned](https://github.com/martinvonz/jj/pull/1610#discussion_r1199823932) to match his suggestion. After some more thinking while working on tree-level conflicts, I now think it's clear that the added `+C-C` terms should have no effect on the result. A very similar argument is that `Conflict::simplify()` should not change the result of `trivial_merge()`. I'll add tests for that next.		2023-06-19 08:30:09 +02:00
..
benches	benches: group unchanged/modified/reversed-line diffs together	2023-03-27 23:38:56 +09:00
gen-protos	cargo: bump prost-build from 0.11.8 to 0.11.9	2023-04-14 16:11:09 +00:00
src	conflicts: resolve trivial merge of A+A-B+C-C to A	2023-06-19 08:30:09 +02:00
tests	conflicts: move describe_conflict() etc. onto Conflict	2023-06-19 07:05:02 +02:00
testutils	cargo: bump tempfile from 3.5.0 to 3.6.0	2023-06-08 22:53:55 -07:00
build.rs	lib: replace protobuf crate with prost	2022-12-22 07:04:35 -08:00
Cargo.toml	cargo: bump serde_json from 1.0.96 to 1.0.97	2023-06-19 06:42:19 +02:00