Martin von Zweigbergk 65a988e3d2 merged_tree: make tree builder attempt to resolve conflicts ... As we discovered in the `jj fix` tests, `MergedTreeBuilder::write_tree()` doesn't try to resolve conflicts, not even trivial ones. This patch fixes that.		2024-06-08 20:29:30 +09:00
..
benches
gen-protos
proc-macros
src	merged_tree: make tree builder attempt to resolve conflicts	2024-06-08 20:29:30 +09:00
tests	merged_tree: make tree builder attempt to resolve conflicts	2024-06-08 20:29:30 +09:00
testutils
Cargo.toml
LICENSE