Martin von Zweigbergk 873a6f0674 merged_tree: add a function for merging 3 MergedTrees ... With the already existing `MergedTree::resolve()` and all the recent refactorings into `Merge<T>`, it's now very easy to add support for 3-way merging of `MergedTree` instances.		2023-08-28 15:58:34 -07:00
..
test_bad_locking.rs
test_commit_builder.rs	commit_builder: take MergedTreeId for root id argument	2023-08-28 15:58:34 -07:00
test_commit_concurrent.rs
test_conflicts.rs	merge: add Merge::num_sides()	2023-08-25 08:54:49 -07:00
test_default_revset_graph_iterator.rs	revset_graph: preserve original parents order	2023-07-29 05:36:09 +09:00
test_diff_summary.rs
test_git.rs	commit_builder: take MergedTreeId for root id argument	2023-08-28 15:58:34 -07:00
test_id_prefix.rs	commit_builder: take MergedTreeId for root id argument	2023-08-28 15:58:34 -07:00
test_index.rs
test_init.rs	commits: use empty strings instead of placeholders for missing name or email	2023-08-18 17:22:59 -05:00
test_load_repo.rs
test_merge_trees.rs	commit_builder: take MergedTreeId for root id argument	2023-08-28 15:58:34 -07:00
test_merged_tree.rs	merged_tree: add a function for merging 3 MergedTrees	2023-08-28 15:58:34 -07:00
test_mut_repo.rs	commit_builder: take MergedTreeId for root id argument	2023-08-28 15:58:34 -07:00
test_operations.rs	op_store: make ViewId and OperationId implement ObjectId	2023-07-26 14:17:21 -07:00
test_refs.rs	conflicts: move Merge<T> to merge module	2023-08-06 22:08:09 +00:00
test_revset.rs	commit_builder: take MergedTreeId for root id argument	2023-08-28 15:58:34 -07:00
test_rewrite.rs	commit_builder: take MergedTreeId for root id argument	2023-08-28 15:58:34 -07:00
test_view.rs	tests: move commit_transactions() helper to testutils	2023-08-10 06:27:16 +09:00
test_working_copy.rs	tests: make test helper for snapshotting working copy return MergedTree	2023-08-27 06:49:45 -07:00
test_working_copy_concurrent.rs	tests: make test helper for snapshotting working copy return MergedTree	2023-08-27 06:49:45 -07:00
test_working_copy_sparse.rs	tests: make test helper for snapshotting working copy return MergedTree	2023-08-27 06:49:45 -07:00
test_workspace.rs