Yuya Nishihara da16bf340c conflicts: fix off-by-one error in materialize_merge_result() ... This should fix #1304. I think the added test simulates the behavior of multiple rebase conflicts, but I don't have expertise around this. add_index could be replaced with a peekable iterator, but the iterator version wouldn't be as readable as the current implementation.		2023-02-24 19:58:10 +09:00
..
test_bad_locking.rs	repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo	2023-02-15 19:15:17 -08:00
test_commit_builder.rs	repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo	2023-02-15 19:15:17 -08:00
test_commit_concurrent.rs	repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo	2023-02-15 19:15:17 -08:00
test_conflicts.rs	conflicts: fix off-by-one error in materialize_merge_result()	2023-02-24 19:58:10 +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	cmd: --branch option for git fetch.	2023-02-21 18:33:40 -08:00
test_index.rs	repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo	2023-02-15 19:15:17 -08:00
test_init.rs	repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo	2023-02-15 19:15:17 -08:00
test_load_repo.rs	op_heads_store: remove LockedOpHeads	2023-01-20 15:18:08 -08:00
test_merge_trees.rs	backend: rename ConflictPart to ConflictTerm	2023-02-17 23:28:50 -08:00
test_mut_repo.rs	repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo	2023-02-15 19:15:17 -08:00
test_operations.rs	repo: replace RepoRef by Repo trait	2023-02-15 19:15:17 -08: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	revset: replace RevsetIterator wrapper by extension	2023-02-19 21:37:26 -08:00
test_revset_graph_iterator.rs	revset: pass revset, not iterator, into RevsetGraphIterator	2023-02-19 21:37:26 -08: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	backend: rename ConflictPart to ConflictTerm	2023-02-17 23:28:50 -08:00
test_working_copy_concurrent.rs	repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo	2023-02-15 19:15:17 -08:00
test_working_copy_sparse.rs	repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo	2023-02-15 19:15:17 -08:00
test_workspace.rs	repo: extract a Repo trait for Arc<ReadonlyRepo> and MutableRepo	2023-02-15 19:15:17 -08:00