Martin von Zweigbergk ecc030848d conflicts: rename Conflict<T> to Merge<T> ... Since `Conflict<T>` can also represent a non-conflict state (a single term), `Merge<T>` seems like better name. Thanks to @ilyagr for the suggestion in https://github.com/martinvonz/jj/pull/1774#discussion_r1257547709 Sorry about the churn. It would have been better if I thought of this name before I introduced `Conflict<T>`.		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: rename Conflict<T> to Merge<T>	2023-08-06 22:08:09 +00:00
tests	conflicts: rename Conflict<T> to Merge<T>	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