Martin von Zweigbergk a995c66635 merge: move some methods back to conflicts as free functions ... I think I moved way too many functions onto `Merge<Option<TreeValue>>` in 82883e648d. This effectively reverts almost all of that commit. The `Merge<T>` type is simple container and it seems like it should be at fairly low level in the dependency graph. By moving functions off of it, we can get rid of the back-depdencies from the `merge` module to the `conflict` module that I introduced when I moved `Merge` to the `merge` module. I'm thinking the `conflict` module can focus on materialized conflicts.		2023-08-11 21:11:25 +00:00
..
test_bad_locking.rs
test_commit_builder.rs
test_commit_concurrent.rs
test_conflicts.rs	merge: move some methods back to conflicts as free functions	2023-08-11 21:11:25 +00: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_merged_tree.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