diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-29 10:12:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-30 19:41:43 -0700 |
| commit | cc58d7dfddc842360f6aade1507e1063d8cd0f40 (patch) | |
| tree | b35c2c193ddc0c27b73169b4b909257e9688467a /entry.c | |
| parent | xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less (diff) | |
| download | tgif-cc58d7dfddc842360f6aade1507e1063d8cd0f40.tar.xz | |
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>
Diffstat (limited to 'entry.c')
0 files changed, 0 insertions, 0 deletions