Martin von Zweigbergk 6e6ca16fd4 tree: make try_resolve_file_conflict() write resolved file to store ... The function takes a `&Conflict<Option<TreeValue>>` argument so it seems it should return an `Option<TreeValue>` for symmetry.		2023-06-13 08:49:46 +02:00
..
benches
gen-protos
src	tree: make try_resolve_file_conflict() write resolved file to store	2023-06-13 08:49:46 +02:00
tests	conflicts: remove ConflictId from update_conflict_from_content()	2023-06-13 08:49:46 +02:00
testutils
build.rs
Cargo.toml