Martin von Zweigbergk 83fefa9a3b conflicts: add a map(), use in extract_as_single_hunk() ... Now that we've replaced `MergeHunk` by a `Conflict`, it makes sense to convert the input `Conflict<FileId>` by mapping each term. Unlike `Option::map()` I made `Conflict::map()` take a reference `self`, because it's not uncommon to want to map the same conflict multiple times. I'm going to use that for producing a `Conflict<Option<TreeValue>>` from a `Conflict<Tree>` and a set of paths.		2023-06-30 14:43:58 +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	conflicts: add a map(), use in extract_as_single_hunk()	2023-06-30 14:43:58 +02:00
tests	store: cache tree on write and return it	2023-06-30 14:12:36 +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 num_cpus from 1.15.0 to 1.16.0	2023-06-29 18:49:48 +02:00