Martin von Zweigbergk 2e6a0f9e96 merged_tree: make resolve() also simplify the result ... This changes the documented behavior of `resolve()` since it was previously documented to not change the arity unless all conflicts were resolved. I plan to use `resolve()` from `MergedTreeBuilder::write_tree()`.		2024-06-08 20:29:30 +09: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
proc-macros	cargo: explicitly indicate paths to publish	2024-04-15 20:37:00 -07:00
src	merged_tree: make resolve() also simplify the result	2024-06-08 20:29:30 +09:00
tests	merged_tree: make resolve() return a MergedTree	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