Martin von Zweigbergk 779b8ba318 files: replace uses of MergeHunk by Conflict<ContentHunk> ... Since `Conflict`s can represent the resolved state, so `Conflict<ContentHunk>` can represent the states that we use `MergeHunk` for. `MergeHunk` does force the user to handle the resolved case, which may be useful. I suppose one could use the same argument for making `Conflict` an enum, i.e. if we think that `MergeHunk`'s two variants are beneficial, then we should consider making `Conflict` an enum with those two variants.		2023-06-28 06:51:37 +02:00
..
test_bad_locking.rs
test_commit_builder.rs
test_commit_concurrent.rs
test_conflicts.rs	files: replace uses of MergeHunk by Conflict<ContentHunk>	2023-06-28 06:51:37 +02:00
test_default_revset_graph_iterator.rs
test_diff_summary.rs
test_git.rs	git: add .gitmodules parser	2023-06-27 10:07:00 -07:00
test_id_prefix.rs
test_index.rs	index: turn CompositeIndex::walk_revs() into position-based API	2023-06-19 13:41:43 +09:00
test_init.rs
test_load_repo.rs
test_merge_trees.rs	store: do conversion to/from backend::Conflict	2023-06-04 06:48:34 -07:00
test_mut_repo.rs
test_operations.rs
test_refs.rs
test_revset.rs	revsets: stop jj parsing br as a git_ref refs/heads/br	2023-06-12 14:31:44 -07:00
test_rewrite.rs
test_view.rs
test_working_copy.rs	store: do conversion to/from backend::Conflict	2023-06-04 06:48:34 -07:00
test_working_copy_concurrent.rs
test_working_copy_sparse.rs
test_workspace.rs