Yuya Nishihara 0b083b2ddb conflicts: in materialize_merge_result(), always use adds.get(index) ... I don't think this is more readable than the original code, but it gives diff1/right1 and diff2/right2 pairs consistent names.		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: in materialize_merge_result(), always use adds.get(index)	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	lib: replace protobuf crate with prost	2022-12-22 07:04:35 -08:00
Cargo.toml	cargo: bump prost from 0.11.6 to 0.11.7	2023-02-23 15:32:35 +00:00