Yuya Nishihara 9bf8452411 conflicts: simplify state management of parse_conflict_hunk() ... We no longer need body_seen because the header lines are deterministic.		2022-09-21 06:03:59 +09:00
..
src	conflicts: simplify state management of parse_conflict_hunk()	2022-09-21 06:03:59 +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 itertools from 0.10.4 to 0.10.5	2022-09-20 10:54:43 -07:00