Martin von Zweigbergk dee5dff20d conflicts: preserve diffs when simplfying a conflict ... If we allow `Conflict::simplify()` to swap the removes and adds as freely as we currently do, we may present the user with a conflict marker with a diff that has never appeared anywhere before the simplification. That seems very confusing. Let's instead preserve the diffs when we simplify conflicts.		2023-06-21 06:42:18 +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: preserve diffs when simplfying a conflict	2023-06-21 06:42:18 +02:00
tests	Fix jj init --git-repo fails and leaves broken .jj folder	2023-06-20 11:02:06 -07:00
testutils	Fix jj init --git-repo fails and leaves broken .jj folder	2023-06-20 11:02:06 -07:00
build.rs	lib: replace protobuf crate with prost	2022-12-22 07:04:35 -08:00
Cargo.toml	cargo: bump pest_derive from 2.6.0 to 2.6.1	2023-06-21 06:18:50 +02:00