Martin von Zweigbergk 8e6e04b929 conflicts: always use tree-level format for merged trees ... It's been about six months since we started using tree-level conflicts by default. I can't imagine we would switch back. So let's continue the migration by always using tree-level conflicts when merging trees, even if all inputs were legacy trees.		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 use tree-level format for merged trees	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