Martin von Zweigbergk aa2792c5e5 merge: add a generic function for resolving trivial N-way merges ... We already resolve merge conflicts between hunks, trees, and refs, and maybe more. They each have their own code for the handling trivial merges (where the output is equal to one of the inputs). They look surprisingly different. This commit adds a generic function for doing that. Curiously, this new implementation uses implements it in yet another way (basically using a multi-set).		2023-05-24 22:00:38 -07: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	merge: add a generic function for resolving trivial N-way merges	2023-05-24 22:00:38 -07:00
tests	tests: invoke .walk_revs() through CompositeIndex	2023-05-24 01:02:37 +09:00
testutils	cargo: bump git2 from 0.17.0 to 0.17.1	2023-04-17 09:19:58 -07:00
build.rs	lib: replace protobuf crate with prost	2022-12-22 07:04:35 -08:00
Cargo.toml	cargo: bump regex from 1.8.1 to 1.8.2	2023-05-23 16:13:49 +00:00