Martin von Zweigbergk 65a988e3d2 merged_tree: make tree builder attempt to resolve conflicts ... As we discovered in the `jj fix` tests, `MergedTreeBuilder::write_tree()` doesn't try to resolve conflicts, not even trivial ones. This patch fixes that.		2024-06-08 20:29:30 +09:00
..
runner.rs	repo: add method for tranforming descendants, use in rebase_descendants()	2024-04-18 21:06:52 -07:00
test_bad_locking.rs
test_commit_builder.rs	cleanup: propagate errors from Commit::predecessors()	2024-05-13 07:39:14 -07:00
test_commit_concurrent.rs
test_conflicts.rs	conflicts: label closing delimeter with conflict number	2024-05-20 18:36:51 -07:00
test_default_revset_graph_iterator.rs	revset_graph: rename to graph and make generic over graph node type	2024-05-31 02:39:34 +08:00
test_diff_summary.rs
test_git.rs	git: unset unborn HEAD ref on export	2024-06-01 11:01:16 +09:00
test_git_backend.rs	tests: compare git refs loaded from disk, not in-memory cache values	2024-04-22 18:46:28 +09:00
test_gpg.rs	gpg_signing: handle early termination of gpg command in verify path	2024-03-03 18:35:10 +09:00
test_id_prefix.rs
test_index.rs	index: turn CompositeIndex into transparent reference type	2024-03-11 17:24:10 +09:00
test_init.rs	cleanup: propagate errors from Commit::predecessors()	2024-05-13 07:39:14 -07:00
test_load_repo.rs
test_local_working_copy.rs	backend: add error variant for access denied, handle when diffing	2024-05-30 18:27:38 -07:00
test_local_working_copy_concurrent.rs
test_local_working_copy_sparse.rs
test_merge_trees.rs	tree_builder: propagate errors from write_tree()	2024-05-22 06:46:38 -07:00
test_merged_tree.rs	merged_tree: make tree builder attempt to resolve conflicts	2024-06-08 20:29:30 +09:00
test_mut_repo.rs	repo: consider empty and undescribed merge commits as discardable	2024-05-29 06:54:30 -07:00
test_operations.rs
test_refs.rs	jj git push: safety checks in push negotiation, "force-with-lease"	2024-05-28 21:38:26 -07:00
test_revset.rs	revset_graph: rename to graph and make generic over graph node type	2024-05-31 02:39:34 +08:00
test_rewrite.rs	repo: when abandoning a working copy that a merge, recreate it	2024-05-29 06:54:30 -07:00
test_rewrite_transform.rs	rewrite: add CommitRewriter::record_abandoned_commit()	2024-04-30 20:03:57 -07:00
test_signing.rs
test_ssh_signing.rs
test_view.rs
test_workspace.rs