From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Aug 2008 17:12:23 +0000 (-0700)
Subject: rerere.c: use symbolic constants to keep track of parsing states
X-Git-Tag: v1.6.1-rc1~195^2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cc58d7dfddc842360f6aade1507e1063d8cd0f40?hp=cc58d7dfddc842360f6aade1507e1063d8cd0f40

rerere.c: use symbolic constants to keep track of parsing states

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: Junio C Hamano <gitster@pobox.com>
---