Martin von Zweigbergk 2102de94b0 working_copy: inline write_conflict_to_store() ... For tree-level conflicts, we're eventually not going to have `ConflictId`. We'd want to make `write_conflict_to_store()` take a `Merge<Option<TreeValue>>` and return an updated such value. That would leave very little logic in the function, so let's just inline it instead.		2023-08-13 01:00:31 +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	working_copy: inline write_conflict_to_store()	2023-08-13 01:00:31 +00:00
tests	conflicts: make update_from_content() write resolved content to store	2023-08-11 23:59:44 +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