forked from mirrors/jj
502150b2f4
We didn't have any tests with negative snapshots (after a `-------` line). I initially thought we couldn't produce such conflict markers anymore. I'm not sure we want to render conflicts like the one in the test like this. I don't think I intended for `add_index` in the code to be able to be two steps ahead of the remove. Maybe we should rewrite the algorithm to not do that and thus never produce negative snapshots. |
||
---|---|---|
.. | ||
benches | ||
gen-protos | ||
src | ||
tests | ||
testutils | ||
Cargo.toml | ||
LICENSE |