Martin von Zweigbergk ecc030848d conflicts: rename Conflict<T> to Merge<T> ... Since `Conflict<T>` can also represent a non-conflict state (a single term), `Merge<T>` seems like better name. Thanks to @ilyagr for the suggestion in https://github.com/martinvonz/jj/pull/1774#discussion_r1257547709 Sorry about the churn. It would have been better if I thought of this name before I introduced `Conflict<T>`.		2023-08-06 22:08:09 +00:00
..
test_bad_locking.rs	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
test_commit_builder.rs	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
test_commit_concurrent.rs	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
test_conflicts.rs	conflicts: rename Conflict<T> to Merge<T>	2023-08-06 22:08:09 +00: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	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
test_git.rs	simple_op_store: serialize RefTarget in new format (breaks downgrades)	2023-07-27 15:32:48 +09:00
test_id_prefix.rs	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
test_index.rs	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
test_init.rs	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
test_load_repo.rs	operation: propagate OpStoreError	2023-07-25 12:46:59 -05:00
test_merge_trees.rs	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
test_merged_tree.rs	conflicts: rename Conflict<T> to Merge<T>	2023-08-06 22:08:09 +00:00
test_mut_repo.rs	refs: add stub constructors for absent RefTarget, replace None with it	2023-07-17 08:24:24 +09:00
test_operations.rs	op_store: make ViewId and OperationId implement ObjectId	2023-07-26 14:17:21 -07:00
test_refs.rs	conflicts: rename Conflict<T> to Merge<T>	2023-08-06 22:08:09 +00:00
test_revset.rs	revset: extract graph-related types to separate module	2023-07-25 01:45:37 +09:00
test_rewrite.rs	refs: rename RefTarget::is_conflict() to has_conflict()	2023-07-23 22:25:57 +09:00
test_view.rs	tests: another attempt to fix remaining flaky tests in test_view.rs	2023-08-04 23:36:15 +00:00
test_working_copy.rs	conflicts: rename Conflict<T> to Merge<T>	2023-08-06 22:08:09 +00:00
test_working_copy_concurrent.rs	tests: add TestWorkspace::snapshot() to simplify snapshotting	2023-07-28 09:32:18 -07:00
test_working_copy_sparse.rs	tests: add TestWorkspace::snapshot() to simplify snapshotting	2023-07-28 09:32:18 -07:00
test_workspace.rs	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00