mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-05 19:14:43 +00:00
19fd8a917a
For tree-level conflicts (#1624), I plan to remove `ConflictId` completely. This commit removes `ConflictId` from `update_conflict_from_content()` by instead making it take a `Conflict<Option<TreeValue>>` and return a possibly different such value. I made the call site in `working_copy` avoid writing the conflict to the store if it's unchanged, but I didn't make the same optimization in `merge_tools` becuase it's much more likely to have changed there. |
||
|---|---|---|
| .. | ||
| benches | ||
| gen-protos | ||
| src | ||
| tests | ||
| testutils | ||
| build.rs | ||
| Cargo.toml | ||