Martin von Zweigbergk eacdad3ebd working_copy: move writing of conflicts to receiver side of channel ... When writing tree-level conflicts, we're going to be writing multiple tree (maybe using some new `MergedTreeBuilder`), so we'll need the full `Merge<Option<TreeValue>>` object. This gets us closer to that by sending such objects over the channel and having the receiver write the conflict object. Note that we still sometimes send `TreeValue::Conflict` variants over the channel. That only happens if they're unchanged.		2023-08-14 23:32:52 -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	working_copy: move writing of conflicts to receiver side of channel	2023-08-14 23:32:52 -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