forked from mirrors/jj
828d528361
This adds a function for resolving conflicts that can be automatically resolved, i.e. like our current `merge_trees()` function. However, the new function is written to merge an arbitrary number of trees and, in case of unresolvable conflicts, to produce a `Conflict<TreeId>` as result instead of writing path-level conflicts to the backend. Like `merge_trees()`, it still leaves conflicts unresolved at the file level if any hunks conflict, and it resolves paths that can be trivially resolved even if there are other paths that do conflict. |
||
|---|---|---|
| .. | ||
| test_bad_locking.rs | ||
| test_commit_builder.rs | ||
| test_commit_concurrent.rs | ||
| test_conflicts.rs | ||
| test_default_revset_graph_iterator.rs | ||
| test_diff_summary.rs | ||
| test_git.rs | ||
| test_id_prefix.rs | ||
| test_index.rs | ||
| test_init.rs | ||
| test_load_repo.rs | ||
| test_merge_trees.rs | ||
| test_merged_tree.rs | ||
| test_mut_repo.rs | ||
| test_operations.rs | ||
| test_refs.rs | ||
| test_revset.rs | ||
| test_rewrite.rs | ||
| test_view.rs | ||
| test_working_copy.rs | ||
| test_working_copy_concurrent.rs | ||
| test_working_copy_sparse.rs | ||
| test_workspace.rs | ||