Martin von Zweigbergk dffe069985 conflicts: remove redundant check of num_sides from condition ... Since `Merge` always has one more "adds" than "removes", there's no need to check both of them. I really should have noticed this in 0b3b62a777.		2023-08-14 08:44:38 -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	cargo: unify a lot of crate metadata in the workspace	2023-08-06 16:44:33 -05:00
src	conflicts: remove redundant check of num_sides from condition	2023-08-14 08:44:38 -07:00
tests	conflicts: remove redundant num_removes argument from parse_conflict()	2023-08-13 09:54:16 +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