Martin von Zweigbergk 828d528361 merged_tree: add a function for resolving conflicts ... 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.		2023-07-19 22:04:16 -07:00
..
benches	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
gen-protos	backend: split up store.proto in git and local versions	2023-06-22 13:49:46 +02:00
src	merged_tree: add a function for resolving conflicts	2023-07-19 22:04:16 -07:00
tests	merged_tree: add a function for resolving conflicts	2023-07-19 22:04:16 -07:00
testutils	merged_tree: introduce a type for a set of trees to merge on the fly	2023-07-19 22:04:16 -07:00
Cargo.toml	cargo: bump the cargo-dependencies group with 2 updates	2023-07-19 11:30:15 -05:00