X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=rerere.c;h=d03a69634b81e1146c20182670a400b0c29b275f;hb=452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e;hp=910cfd963dcdbcb096b36b91868955a65ecdffa1;hpb=0c72cead8435b2865efc884060bd0bd49313cbd5;p=git.git diff --git a/rerere.c b/rerere.c index 910cfd963..d03a69634 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;