Martin von Zweigbergk 1c284322b3 files: leverage trivial_merge() in merge() ... Note that one test changed because the new `trivial_merge()` is more strict than the old algorithm. I don't think that's a problem because 5-way conflicts are not very common, and I prefer to be strict now and possibly relax it later if we decide that we would prefer that.		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	files: leverage trivial_merge() in merge()	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
Cargo.toml	cargo: bump regex from 1.8.1 to 1.8.2	2023-05-23 16:13:49 +00:00