Yuya Nishihara da16bf340c conflicts: fix off-by-one error in materialize_merge_result() ... This should fix #1304. I think the added test simulates the behavior of multiple rebase conflicts, but I don't have expertise around this. add_index could be replaced with a peekable iterator, but the iterator version wouldn't be as readable as the current implementation.		2023-02-24 19:58:10 +09:00
..
gen-protos	cargo: bump prost-build from 0.11.6 to 0.11.7	2023-02-24 11:55:41 +09:00
src	conflicts: fix off-by-one error in materialize_merge_result()	2023-02-24 19:58:10 +09:00
tests	conflicts: fix off-by-one error in materialize_merge_result()	2023-02-24 19:58:10 +09:00
testutils	release: release version 0.7.0	2023-02-16 12:50:52 -08:00
build.rs
Cargo.toml	cargo: bump prost from 0.11.6 to 0.11.7	2023-02-23 15:32:35 +00:00