mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-06 20:42:10 +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. |
||
|---|---|---|
| .. | ||
| commands | ||
| config | ||
| cleanup_guard.rs | ||
| cli_util.rs | ||
| commit_templater.rs | ||
| config-schema.json | ||
| config.rs | ||
| diff_util.rs | ||
| formatter.rs | ||
| graphlog.rs | ||
| lib.rs | ||
| main.rs | ||
| merge_tools.rs | ||
| operation_templater.rs | ||
| progress.rs | ||
| template.pest | ||
| template_builder.rs | ||
| template_parser.rs | ||
| templater.rs | ||
| text_util.rs | ||
| time_util.rs | ||
| ui.rs | ||