Martin von Zweigbergk 19fd8a917a conflicts: remove ConflictId from update_conflict_from_content() ... 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.		2023-06-13 08:49:46 +02:00
..
test_bad_locking.rs
test_commit_builder.rs
test_commit_concurrent.rs
test_conflicts.rs	conflicts: remove ConflictId from update_conflict_from_content()	2023-06-13 08:49:46 +02:00
test_default_revset_graph_iterator.rs
test_diff_summary.rs
test_git.rs
test_id_prefix.rs
test_index.rs
test_init.rs
test_load_repo.rs
test_merge_trees.rs
test_mut_repo.rs
test_operations.rs
test_refs.rs
test_revset.rs
test_rewrite.rs
test_view.rs
test_working_copy.rs
test_working_copy_concurrent.rs
test_working_copy_sparse.rs
test_workspace.rs