Martin von Zweigbergk 4c46398b1c conflicts: make update_from_content() write resolved content to store ... `update_from_content()` already writes file content for each term of an unresolved merge, so it seems consistent for it to also write the file content for resolved merges. I think this should simplify further refactoring for tree-level conflicts and for preserving the executable bit.		2023-08-11 23:59:44 +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: make update_from_content() write resolved content to store	2023-08-11 23:59:44 +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