Martin von Zweigbergk 1895a55157 working_copy: make old_checkout argument be MergedTreeId ... I think this was the last piece for making the working copy handle tree-level conflicts.		2023-08-27 06:49:45 -07: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	working_copy: make old_checkout argument be MergedTreeId	2023-08-27 06:49:45 -07:00
tests	working_copy: make old_checkout argument be MergedTreeId	2023-08-27 06:49:45 -07:00
testutils	working_copy: return MergedTreeId on snapshot	2023-08-27 06:49:45 -07:00
Cargo.toml	merged_tree: add diff iterator	2023-08-25 06:40:36 -07:00