Martin von Zweigbergk a995c66635 merge: move some methods back to conflicts as free functions ... I think I moved way too many functions onto `Merge<Option<TreeValue>>` in 82883e648d. This effectively reverts almost all of that commit. The `Merge<T>` type is simple container and it seems like it should be at fairly low level in the dependency graph. By moving functions off of it, we can get rid of the back-depdencies from the `merge` module to the `conflict` module that I introduced when I moved `Merge` to the `merge` module. I'm thinking the `conflict` module can focus on materialized conflicts.		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	merge: move some methods back to conflicts as free functions	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