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	benches: group unchanged/modified/reversed-line diffs together	2023-03-27 23:38:56 +09:00
gen-protos	cargo: bump prost-build from 0.11.8 to 0.11.9	2023-04-14 16:11:09 +00:00
src	tree: don't read file contents on contents/executable "conflict"	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	cargo: bump tempfile from 3.5.0 to 3.6.0	2023-06-08 22:53:55 -07:00
build.rs	lib: replace protobuf crate with prost	2022-12-22 07:04:35 -08:00
Cargo.toml	cargo: bump rustix from 0.37.19 to 0.37.20	2023-06-12 12:29:26 -07:00