| commit | cc58d7dfddc842360f6aade1507e1063d8cd0f40 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 Aug 2008 17:12:23 +0000 (29 10:12 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 31 Aug 2008 02:41:43 +0000 (30 19:41 -0700) | ||
| tree | b35c2c193ddc0c27b73169b4b909257e9688467a | treesnapshot (tar.gz zip) |
| parent | 83133740d9c81ce4c98cb53b85c8d5b190944f81 | commitdiff |
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>
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>
| rerere.c | diffblobblamehistory |