diff options
Diffstat (limited to 'rerere.c')
-rw-r--r-- | rerere.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -173,7 +173,7 @@ static int handle_file(const char *path, git_SHA1_Final(sha1, &ctx); if (hunk != RR_CONTEXT) { if (output) - unlink(output); + unlink_or_warn(output); return error("Could not parse conflict hunks in %s", path); } if (wrerror) |