Martin von Zweigbergk c0ae4b16e8 trees: try to resolve file conflicts after simplifying conflicts ... This fixes a bug I've run into somewhat frequently. What happens is that if you have a conflict on top of another conflict and you resolve the conflict in the bottom commit, we just simplify the `Conflict` object in the second commit, but we don't try to resolve the new conflict. That shows up as an unexpected "conflict" in `jj log` output, and when you check out the commit, there are actually no conflicts, so you can just `jj squash` right away. This patch fixes that bug. It also teaches the code to work with more than 3 parts in the merge, so if there's a 5-way conflict, for example, we still try to resolve it if possible.		2021-10-22 09:20:50 -07:00
..
test_bad_locking.rs
test_commit_builder.rs
test_commit_concurrent.rs
test_conflicts.rs	conflicts: work around rust-lang/rust#89716	2021-10-13 13:41:09 -07:00
test_diff_summary.rs
test_git.rs	git: don't update public heads for now	2021-10-20 14:23:58 -07:00
test_index.rs
test_init.rs
test_load_repo.rs
test_merge_trees.rs	trees: try to resolve file conflicts after simplifying conflicts	2021-10-22 09:20:50 -07:00
test_mut_repo.rs
test_operations.rs
test_refs.rs
test_revset.rs	revset: make head() accept candidate set to find heads within	2021-10-13 09:41:20 -07:00
test_revset_graph_iterator.rs
test_rewrite.rs
test_view.rs
test_working_copy.rs
test_working_copy_concurrent.rs