jj/lib
Martin von Zweigbergk 8f75a8236a conflicts: add test of higher-arity conflict simplificaton changing diffs
It's a bit weird to simplify a conflict like `A B->C D->E C->F` to `A
B->E D->F` because it changes which diffs are in the conflict, but
that's what we currently do. Let's have a test for that.

We actually already have tests showing how `A B->C D->A` gets
simplified to `C B->D`, but those are less obviously weird because
when rendered as `removes = [B], adds = [C, D]`, it doesn't look that
different from the reverse.
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: add test of higher-arity conflict simplificaton changing diffs 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