forked from mirrors/jj
8f75a8236a
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. |
||
|---|---|---|
| .. | ||
| benches | ||
| gen-protos | ||
| src | ||
| tests | ||
| testutils | ||
| build.rs | ||
| Cargo.toml | ||