Martin von Zweigbergk 02bb3aecf3 tree: don't read file contents on contents/executable "conflict" ... If one side changes the contents and one side changes the executable bit, we get a non-trivial conflict in the `TreeValue`s, but once we've split them up into `FileId`s and bools, we can trivially resolve them separately, without having to read file contents.		2023-06-13 08:49:46 +02:00
..
benches
gen-protos
src	tree: don't read file contents on contents/executable "conflict"	2023-06-13 08:49:46 +02:00
tests
testutils
build.rs
Cargo.toml