Yuya Nishihara 4ffbf40c82 merged_tree: do not propagate conflicting empty tree value to parent ... Otherwise an empty subtree would be added to the parent tree. If the stored tree contained an empty subtree, simplify() wouldn't work against new "absent" subtree representation. I don't know if there's a such code path, but I believe it's very rare to encounter the problem. #2654		2023-12-03 07:44:58 +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
src	merged_tree: do not propagate conflicting empty tree value to parent	2023-12-03 07:44:58 +09:00
tests	merged_tree: do not propagate conflicting empty tree value to parent	2023-12-03 07:44:58 +09:00
testutils	signing: pass SigningFn by reference	2023-12-01 22:55:04 +09:00
Cargo.toml	cargo: add ref-cast dependency	2023-11-26 18:21:40 +09:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00