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	Use { workspace = true } to appease VS Code's Cargo.toml parser	2023-08-22 21:38:53 -07:00
proc-macros	cargo: explicitly indicate paths to publish	2024-04-15 20:37:00 -07:00
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	backend: add error variant for access denied, handle when diffing	2024-05-30 18:27: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