Martin von Zweigbergk 28d3ad6f1d files: add more multi-hunk tests ... We seemed to have poor coverage of merges affecting multiple hunks, so I added a few. Thanks to @quark-zju for providing the last of them.		2023-05-24 22:00:38 -07:00
..
lock
protos
backend.rs
commit.rs
commit_builder.rs
conflicts.rs
content_hash.rs
dag_walk.rs
default_index_store.rs	index: remove walk_revs() from trait API	2023-05-24 01:02:37 +09:00
default_revset_engine.rs
default_revset_graph_iterator.rs
diff.rs
file_util.rs
files.rs	files: add more multi-hunk tests	2023-05-24 22:00:38 -07:00
git.rs	index: replace use of walk_revs() with revset API	2023-05-24 01:02:37 +09:00
git_backend.rs
gitignore.rs
hex_util.rs
id_prefix.rs
index.rs	index: remove walk_revs() from trait API	2023-05-24 01:02:37 +09:00
lib.rs	merge: add a generic function for resolving trivial N-way merges	2023-05-24 22:00:38 -07:00
local_backend.rs
lock.rs
matchers.rs
merge.rs	merge: optimize 3-way merge case	2023-05-24 22:00:38 -07:00
nightly_shims.rs
op_heads_store.rs
op_store.rs	refs: leverage trivial_merge() in merge_ref_targets()	2023-05-24 22:00:38 -07:00
operation.rs
refs.rs	refs: leverage trivial_merge() in merge_ref_targets()	2023-05-24 22:00:38 -07:00
repo.rs	index: replace use of walk_revs() with revset API	2023-05-24 01:02:37 +09:00
repo_path.rs
revset.pest
revset.rs	index: replace use of walk_revs() with revset API	2023-05-24 01:02:37 +09:00
rewrite.rs
settings.rs
simple_op_heads_store.rs
simple_op_store.rs
stacked_table.rs
store.rs
transaction.rs
tree.rs	tree: leverage trivial_merge() in merge_trees()	2023-05-24 22:00:38 -07:00
tree_builder.rs
view.rs
working_copy.rs
workspace.rs