mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-17 17:55:29 +00:00
da16bf340c
This should fix #1304. I think the added test simulates the behavior of multiple rebase conflicts, but I don't have expertise around this. add_index could be replaced with a peekable iterator, but the iterator version wouldn't be as readable as the current implementation. |
||
|---|---|---|
| .. | ||
| gen-protos | ||
| src | ||
| tests | ||
| testutils | ||
| build.rs | ||
| Cargo.toml | ||