diff options
Diffstat (limited to 'builtin-rerere.c')
| -rw-r--r-- | builtin-rerere.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin-rerere.c b/builtin-rerere.c index 610b96a12..addc5c73d 100644 --- a/builtin-rerere.c +++ b/builtin-rerere.c @@ -144,6 +144,11 @@ static int handle_file(const char *path, fclose(out); if (sha1) SHA1_Final(sha1, &ctx); + if (hunk) { + if (output) + unlink(output); + return error("Could not parse conflict hunks in %s", path); + } return hunk_no; } |