Martin von Zweigbergk f8c016a8ea files: make MergeHunk support any number of removes and adds ... I think `files::merge()` will be a useful place to share code for resolving conflicting hunks after all. We'll want `MergeHunk` to support multi-way merges then.		2021-06-30 09:55:16 -07:00
..
commit.rs	repo_path: replace remaining uses of DirRepoPath by RepoPath	2021-05-19 15:11:04 -07:00
commit_builder.rs	repo: make MutableRepo have an Arc<ReadonlyRepo> instead of a reference	2021-04-11 13:42:31 -07:00
conflicts.rs	files: make MergeHunk support any number of removes and adds	2021-06-30 09:55:16 -07:00
dag_walk.rs	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
diff.rs	diff: rewrite diff() using new multi-way diff	2021-06-26 23:49:58 -07:00
evolution.rs	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
file_util.rs	working_copy: consider it an error if temp file cannot be renamed to target	2021-06-16 10:52:55 -07:00
files.rs	files: make MergeHunk support any number of removes and adds	2021-06-30 09:55:16 -07:00
git.rs	cleanup: remove some Vec<_> annotations, mostly by using collect_vec()	2021-06-09 14:21:57 -07:00
git_store.rs	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
gitignore.rs	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
index.rs	working_copy: consider it an error if temp file cannot be renamed to target	2021-06-16 10:52:55 -07:00
index_store.rs	working_copy: consider it an error if temp file cannot be renamed to target	2021-06-16 10:52:55 -07:00
lib.rs	windows: don't fail when concurrent threads/processes fail to rename file	2021-06-14 00:09:22 -07:00
local_store.rs	working_copy: consider it an error if temp file cannot be renamed to target	2021-06-16 10:52:55 -07:00
lock.rs	tests: use one thread per core in concurrency tests	2021-04-29 00:01:04 -07:00
matchers.rs	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
op_heads_store.rs	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
op_store.rs	cli: record full argv in operation log	2021-05-09 22:42:13 -07:00
operation.rs	rustfmt: configure to group imports	2021-03-14 10:46:25 -07:00
protos.rs	protobuf: generate code at build-time	2020-12-24 01:05:17 -08:00
repo.rs	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
repo_path.rs	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
revset.pest	revsets: add "ancestor difference" range operator (like git's ..)	2021-04-23 19:10:28 -07:00
revset.rs	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
revset_graph_iterator.rs	revsets: remove transitive edges in graph iterator by default	2021-05-01 23:25:33 -07:00
rewrite.rs	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
settings.rs	cli: avoid using angle brackets in name/email placeholder, to please git	2021-05-19 13:02:39 -07:00
simple_op_store.rs	working_copy: consider it an error if temp file cannot be renamed to target	2021-06-16 10:52:55 -07:00
store.rs	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
store_wrapper.rs	repo_path: replace remaining uses of DirRepoPath by RepoPath	2021-05-19 15:11:04 -07:00
testutils.rs	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
transaction.rs	view: merge ReadonlyView and MutableView into a single View	2021-06-05 14:08:04 -07:00
tree.rs	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
tree_builder.rs	store: use RepoPathComponent in Tree	2021-06-05 23:36:38 -07:00
view.rs	cleanup: let Clippy fix a bunch of warnings	2021-06-14 00:27:31 -07:00
working_copy.rs	working_copy: consider it an error if temp file cannot be renamed to target	2021-06-16 10:52:55 -07:00