Martin von Zweigbergk c625e9352d files: make MergeHunk::Conflict be a Conflict<ContentHunk> ... The `ConflictHunk` type doesn't add anything over `Conflict<ContentHunk>`.		2023-06-27 21:06:32 +02:00
..
benches
gen-protos	backend: split up store.proto in git and local versions	2023-06-22 13:49:46 +02:00
src	files: make MergeHunk::Conflict be a Conflict<ContentHunk>	2023-06-27 21:06:32 +02:00
tests	files: make MergeHunk::Conflict be a Conflict<ContentHunk>	2023-06-27 21:06:32 +02:00
testutils	cargo: bump itertools from 0.10.5 to 0.11.0	2023-06-22 18:18:48 +02:00
build.rs
Cargo.toml	cargo: bump serde_json from 1.0.97 to 1.0.99	2023-06-27 07:56:50 +02:00