Martin von Zweigbergk 598cfcb89b merged_tree: in diff iterator, maintain legacy/modern variant in subtree ... As #2165 showed, when diffing two `MergedTree::Legacy` variants (or one of each variant) and re recurse into a subtree, we need to treat that as a legacy tree too, so we expand `TreeValue::Conflict`s found in the diff.		2023-08-26 05:58:54 -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	merged_tree: in diff iterator, maintain legacy/modern variant in subtree	2023-08-26 05:58:54 -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