Martin von Zweigbergk 779b8ba318 files: replace uses of MergeHunk by Conflict<ContentHunk> ... Since `Conflict`s can represent the resolved state, so `Conflict<ContentHunk>` can represent the states that we use `MergeHunk` for. `MergeHunk` does force the user to handle the resolved case, which may be useful. I suppose one could use the same argument for making `Conflict` an enum, i.e. if we think that `MergeHunk`'s two variants are beneficial, then we should consider making `Conflict` an enum with those two variants.		2023-06-28 06:51:37 +02:00
..
benches	benches: group unchanged/modified/reversed-line diffs together	2023-03-27 23:38:56 +09:00
gen-protos	backend: split up store.proto in git and local versions	2023-06-22 13:49:46 +02:00
src	files: replace uses of MergeHunk by Conflict<ContentHunk>	2023-06-28 06:51:37 +02:00
tests	files: replace uses of MergeHunk by Conflict<ContentHunk>	2023-06-28 06:51:37 +02:00
testutils	cargo: bump itertools from 0.10.5 to 0.11.0	2023-06-22 18:18:48 +02:00
build.rs	lib: replace protobuf crate with prost	2022-12-22 07:04:35 -08:00
Cargo.toml	cargo: bump serde_json from 1.0.97 to 1.0.99	2023-06-27 07:56:50 +02:00