mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-24 15:43:12 +00:00
3f95dafd67
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. |
||
---|---|---|
.. | ||
lock | ||
protos | ||
backend.rs | ||
commit.rs | ||
commit_builder.rs | ||
conflicts.rs | ||
content_hash.rs | ||
dag_walk.rs | ||
default_index_store.rs | ||
default_revset_engine.rs | ||
default_revset_graph_iterator.rs | ||
diff.rs | ||
file_util.rs | ||
files.rs | ||
git.rs | ||
git_backend.rs | ||
gitignore.rs | ||
hex_util.rs | ||
id_prefix.rs | ||
index.rs | ||
lib.rs | ||
local_backend.rs | ||
lock.rs | ||
matchers.rs | ||
merge.rs | ||
nightly_shims.rs | ||
op_heads_store.rs | ||
op_store.rs | ||
operation.rs | ||
refs.rs | ||
repo.rs | ||
repo_path.rs | ||
revset.pest | ||
revset.rs | ||
rewrite.rs | ||
settings.rs | ||
simple_op_heads_store.rs | ||
simple_op_store.rs | ||
stacked_table.rs | ||
store.rs | ||
transaction.rs | ||
tree.rs | ||
tree_builder.rs | ||
view.rs | ||
working_copy.rs | ||
workspace.rs |