-
由 Junio C Hamano 提交于
These hardcoded integers make the code harder to follow than necessary; replace them with enums to make it easier to read, before adding support for optionally parsing "diff3 -m" style conflict markers. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
cc58d7df