Martin von Zweigbergk 389f27f042 working_copy: move writing of conflict objects into new tree builder ... This introduces a `MergedTreeBuilder` type, which takes a set of base trees and overrides. The idea is that it will be able to write multiple trees or a legacy tree. For now, it's only able to write legacy trees. To show that it works, the working copy's snaphotting code has been updated to use it.		2023-08-26 08:16:57 -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	Use { workspace = true } to appease VS Code's Cargo.toml parser	2023-08-22 21:38:53 -07:00
src	working_copy: move writing of conflict objects into new tree builder	2023-08-26 08:16:57 -07:00
tests	merged_tree: in diff iterator, maintain legacy/modern variant in subtree	2023-08-26 05:58:54 -07:00
testutils	Use { workspace = true } to appease VS Code's Cargo.toml parser	2023-08-22 21:38:53 -07:00
Cargo.toml	merged_tree: add diff iterator	2023-08-25 06:40:36 -07:00