Martin von Zweigbergk d4e755b4e4 merged_tree: rename some symbols away from "conflict" ... There were still many instances of `conflict` left from before we renamed `Conflict<T>` to `Merge<T>`. I decided to rename many of them based on the type parameter instead of the container. I think that made it more readable in many cases.		2023-08-11 21:11:25 +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	merged_tree: rename some symbols away from "conflict"	2023-08-11 21:11:25 +00:00
tests	merge: move some methods back to conflicts as free functions	2023-08-11 21:11:25 +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