Martin von Zweigbergk 94c14d454a tests: levarage the materialize_conflict_string() helper in more places		2023-08-11 23:59:44 +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	tree: inline simplify_conflict()	2023-08-11 21:11:25 +00:00
tests	tests: levarage the materialize_conflict_string() helper in more places	2023-08-11 23:59:44 +00:00
testutils	tests: move commit_transactions() helper to testutils	2023-08-10 06:27:16 +09:00
Cargo.toml	cargo: unify a lot of crate metadata in the workspace	2023-08-06 16:44:33 -05:00