Yuya Nishihara 35f718f212 merged_tree: remove canceling terms prior to resolving file-level conflict ... I think this is a variant of the problem fixed by 7fda80fc22 "tree: simplify conflict before resolving at hunk level." We need to simplify() the conflict before and after extracting file ids because the source conflict values may contain trees to be cancelled out, and the file values may differ only in exec bits. Since the legacy tree passes a simplified conflict in to this function, I made the merged tree do the same. Fixes #2654		2023-12-03 07:44:58 +09:00
..
test_bad_locking.rs	workspace: load working copy implementation dynamically	2023-10-16 22:33:44 -07:00
test_commit_builder.rs	repo_path: split RepoPath into owned and borrowed types	2023-11-28 07:33:28 +09:00
test_commit_concurrent.rs	testutils: delete bool-typed init() in favor of enum-typed version	2023-09-18 07:15:37 -07:00
test_conflicts.rs	repo_path: split RepoPath into owned and borrowed types	2023-11-28 07:33:28 +09:00
test_default_revset_graph_iterator.rs	test: use test backend in most remaining tests too	2023-09-24 21:24:01 -07:00
test_diff_summary.rs	repo_path: split RepoPath into owned and borrowed types	2023-11-28 07:33:28 +09:00
test_git.rs	repo, workspace: remove 'static lifetime bound from initializer functions	2023-12-03 07:44:41 +09:00
test_id_prefix.rs	testutils: delete bool-typed init() in favor of enum-typed version	2023-09-18 07:15:37 -07:00
test_index.rs	test: use test backend in most remaining tests too	2023-09-24 21:24:01 -07:00
test_init.rs	workspace: add function that initializes colocated git repository	2023-11-05 08:48:35 +09:00
test_load_repo.rs	test: use test backend in most remaining tests too	2023-09-24 21:24:01 -07:00
test_local_working_copy.rs	working_copy: use proto file states without rebuilding BTreeMap	2023-11-30 12:09:31 +09:00
test_local_working_copy_concurrent.rs	repo_path: split RepoPath into owned and borrowed types	2023-11-28 07:33:28 +09:00
test_local_working_copy_sparse.rs	working_copy: use proto file states without rebuilding BTreeMap	2023-11-30 12:09:31 +09:00
test_merge_trees.rs	repo_path: split RepoPath into owned and borrowed types	2023-11-28 07:33:28 +09:00
test_merged_tree.rs	merged_tree: remove canceling terms prior to resolving file-level conflict	2023-12-03 07:44:58 +09:00
test_mut_repo.rs	view: add tracking state to RemoteRef	2023-10-16 23:21:05 +09:00
test_operations.rs	tests: test views, operations, and mutable repos only with test backend	2023-09-20 07:47:30 -07:00
test_refs.rs	merge: add Merge constructor that accepts interleaved values	2023-11-07 17:10:12 +09:00
test_revset.rs	repo_path: split RepoPath into owned and borrowed types	2023-11-28 07:33:28 +09:00
test_rewrite.rs	repo_path: split RepoPath into owned and borrowed types	2023-11-28 07:33:28 +09:00
test_signing.rs	sign: Implement a test signing backend and add a few basic tests	2023-11-30 23:36:56 +02:00
test_view.rs	refs: merge tracking state of remote branches	2023-10-24 07:13:58 +09:00
test_workspace.rs	workspace: make working-copy type customizable	2023-10-16 22:33:44 -07:00