Martin von Zweigbergk 16c897d8b4 conflicts: leverage Merge::map() in materialize_merge_result()		2023-09-01 16:23:39 -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	conflicts: leverage Merge::map() in materialize_merge_result()	2023-09-01 16:23:39 -07:00
tests	working_copy: in LockedWorkingCopy::drop(), discard unsaved changes	2023-09-01 12:25:47 -07:00
testutils	tests: leverage create_tree() in a few more tests	2023-08-30 19:58:42 -07:00
Cargo.toml	merged_tree: add diff iterator	2023-08-25 06:40:36 -07:00