Martin von Zweigbergk 3f95dafd67 conflicts: resolve trivial merge of A+A-B+C-C to A ... This changes the behavior in one of the cases ilyagr@ [mentioned](https://github.com/martinvonz/jj/pull/1610#discussion_r1199823932) to match his suggestion. After some more thinking while working on tree-level conflicts, I now think it's clear that the added `+C-C` terms should have no effect on the result. A very similar argument is that `Conflict::simplify()` should not change the result of `trivial_merge()`. I'll add tests for that next.		2023-06-19 08:30:09 +02:00
..
lock
protos
backend.rs
commit.rs
commit_builder.rs
conflicts.rs	conflicts: move describe_conflict() etc. onto Conflict	2023-06-19 07:05:02 +02:00
content_hash.rs
dag_walk.rs
default_index_store.rs	index: turn CompositeIndex::walk_revs() into position-based API	2023-06-19 13:41:43 +09:00
default_revset_engine.rs	index: turn CompositeIndex::walk_revs() into position-based API	2023-06-19 13:41:43 +09:00
default_revset_graph_iterator.rs
diff.rs
file_util.rs
files.rs	conflicts: resolve trivial merge of A+A-B+C-C to A	2023-06-19 08:30:09 +02:00
git.rs	git: return early from import_refs() if no commits to abandon	2023-06-16 09:45:41 +09:00
git_backend.rs
gitignore.rs
hex_util.rs
id_prefix.rs
index.rs
lib.rs
local_backend.rs
lock.rs
matchers.rs
merge.rs	conflicts: resolve trivial merge of A+A-B+C-C to A	2023-06-19 08:30:09 +02:00
nightly_shims.rs
op_heads_store.rs
op_store.rs
operation.rs
refs.rs
repo.rs	git: on import_refs(), don't clobber view's heads with known HEAD@git	2023-06-16 09:45:41 +09:00
repo_path.rs	repo_path: micro-optimize .join() to not reallocate cloned Vec	2023-06-15 00:45:07 +09:00
revset.pest
revset.rs
rewrite.rs
settings.rs
simple_op_heads_store.rs
simple_op_store.rs
stacked_table.rs
store.rs	conflicts: extract methods for converting to/from generic legacy form	2023-06-13 21:48:35 +02:00
transaction.rs
tree.rs	tree: reuse caller-provided path in known_sub_tree(), mark it as private	2023-06-15 00:45:07 +09:00
tree_builder.rs
view.rs
working_copy.rs	conflicts: move describe_conflict() etc. onto Conflict	2023-06-19 07:05:02 +02:00
workspace.rs