Martin von Zweigbergk ef5f97f8d7 conflicts: move Merge<T> to merge module ... The `merge` module now seems like the obvious place for this type.		2023-08-06 22:08:09 +00:00
..
benches	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
gen-protos	cargo: unify a lot of crate metadata in the workspace	2023-08-06 16:44:33 -05:00
src	conflicts: move Merge<T> to merge module	2023-08-06 22:08:09 +00:00
tests	conflicts: move Merge<T> to merge module	2023-08-06 22:08:09 +00:00
testutils	cargo: unify a lot of crate metadata in the workspace	2023-08-06 16:44:33 -05:00
Cargo.toml	cargo: unify a lot of crate metadata in the workspace	2023-08-06 16:44:33 -05:00