X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=rerere.c;h=2197890982e55d7ff0832b6c59b6661874fa4223;hb=8718e875080767f2c8d06c55c3fb5a6dddf0e5a0;hp=f221bed1e97a0f1b41d1845edac270a109e3a4dd;hpb=dd75d07899653258587b854ce0e3f7f1b90610cf;p=git.git diff --git a/rerere.c b/rerere.c index f221bed1e..219789098 100644 --- a/rerere.c +++ b/rerere.c @@ -153,7 +153,7 @@ static int handle_path(unsigned char *sha1, struct rerere_io *io, int marker_siz git_SHA_CTX ctx; int hunk_no = 0; enum { - RR_CONTEXT = 0, RR_SIDE_1, RR_SIDE_2, RR_ORIGINAL, + RR_CONTEXT = 0, RR_SIDE_1, RR_SIDE_2, RR_ORIGINAL } hunk = RR_CONTEXT; struct strbuf one = STRBUF_INIT, two = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;