Martin von Zweigbergk 1f1c6867c7 conflicts: add a simplify() method, taken from tree.rs ... It seems generally useful to be able to simplify a conflict, and it's not specific to merging trees, so let's move it to `conflicts.rs`. Once we're done with the migration to tree-level conflicts, I think `Conflict::simplify()` will remain but `tree::simplify_conflict()` will be gone. The tests I added there are quite similar to those of `trivial_merge()`. I hope we can make `Conflict::simplify()` call `trivial_merge()` later. I think it would also make sense to move `trivial_merge()` onto `Conflict`, or at least have a `Conflict::resolve_trivial()` calling `trivial_merge()`.		2023-06-13 08:49:46 +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: add a simplify() method, taken from tree.rs	2023-06-13 08:49:46 +02:00
tests	conflicts: remove ConflictId from update_conflict_from_content()	2023-06-13 08:49:46 +02:00
testutils	cargo: bump tempfile from 3.5.0 to 3.6.0	2023-06-08 22:53:55 -07:00
build.rs
Cargo.toml	cargo: bump rustix from 0.37.19 to 0.37.20	2023-06-12 12:29:26 -07:00