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. |
||
|---|---|---|
| .. | ||
| benches | ||
| gen-protos | ||
| src | ||
| tests | ||
| testutils | ||
| Cargo.toml | ||