Martin von Zweigbergk 43bf8667d8 conflicts: always write tree-level conflicts from MergedTreeBuilder ... Before this patch, `MergedTreeBuilder::write_tree()` would create a new legacy tree if the base tree was a legacy tree. This patch makes it always write multiple root trees instead (if there are conflicts). We still support reading legacy conflicts if the `format.tree-level-conflicts` config is set.		2024-05-27 06:25:27 -07:00
..
benches
gen-protos
proc-macros	cargo: explicitly indicate paths to publish	2024-04-15 20:37:00 -07:00
src	conflicts: always write tree-level conflicts from MergedTreeBuilder	2024-05-27 06:25:27 -07:00
tests	git: Only reset Git index if non-empty	2024-05-27 11:35:13 +10:00
testutils	tree_builder: propagate errors from write_tree()	2024-05-22 06:46:38 -07:00
Cargo.toml	cargo: explicitly indicate paths to publish	2024-04-15 20:37:00 -07:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00