Yuya Nishihara 16f2b82feb conflicts: change diff line marker to %%%%%%% ... I feel the original -------/+++++++ pair is slightly confusing because each half can be a separator by itself. I don't know what character other than '-'/'+' is preferred, but let's pick '%' (for "mod") per @martinvonz suggestion.		2022-09-20 15:26:29 +09:00
..
src	conflicts: change diff line marker to %%%%%%%	2022-09-20 15:26:29 +09:00
tests	conflicts: change diff line marker to %%%%%%%	2022-09-20 15:26:29 +09:00
build.rs	protos: use run_from_script() in build.rs	2022-05-05 11:46:40 -07:00
Cargo.toml	cargo: bump insta from 1.19.1 to 1.20.0	2022-09-19 10:05:05 -07:00