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	repo: replace load_at_head() by helper in tests	2023-02-27 09:44:28 -08:00
test_commit_builder.rs	git_backend: return timestamps for what was actually written	2023-05-12 15:20:44 -07:00
test_commit_concurrent.rs	dag_walk: rename bfs() to dfs() because it's depth-first	2023-06-04 11:47:49 +09:00
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	index: pass only CompositeIndex to default_revset_engine::evaluate()	2023-05-29 08:15:40 +09:00
test_diff_summary.rs	matchers: simplify FilesMatcher::new() to take slice of paths	2022-12-30 14:15:27 +09:00
test_git.rs	git: add .gitmodules parser	2023-06-27 10:07:00 -07:00
test_id_prefix.rs	id_prefix: remove repo field from IdPrefixContext	2023-05-11 23:41:24 -07:00
test_index.rs	index: turn CompositeIndex::walk_revs() into position-based API	2023-06-19 13:41:43 +09:00
test_init.rs	backend: replace git_repo() by as_any()	2023-05-12 08:05:09 -07:00
test_load_repo.rs	repo: propagate error when failing to look up backend type	2023-02-27 09:44:28 -08:00
test_merge_trees.rs	store: do conversion to/from backend::Conflict	2023-06-04 06:48:34 -07:00
test_mut_repo.rs	tests: avoid some unnecessary calls to index().stats()	2023-03-12 22:08:31 -07:00
test_operations.rs	repo: implement Repo on ReadonlyRepo instead of its Arc	2023-03-21 21:43:44 -07:00
test_refs.rs	repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo	2023-02-15 19:15:17 -08:00
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	repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo	2023-02-15 19:15:17 -08:00
test_view.rs	repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo	2023-02-15 19:15:17 -08:00
test_working_copy.rs	store: do conversion to/from backend::Conflict	2023-06-04 06:48:34 -07:00
test_working_copy_concurrent.rs	cleanup: leverage scoped thread in tests	2023-05-21 21:02:58 +09:00
test_working_copy_sparse.rs	working_copy: introduce snapshot progress callback	2023-05-06 11:07:46 -07:00
test_workspace.rs	repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo	2023-02-15 19:15:17 -08:00