Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'master' into sb/opt-filename
[gitweb.git]
/
rerere.c
diff --git
a/rerere.c
b/rerere.c
index 713c6e16ac536eaa667cc9f22768670be129483c..87360dc23e54aabf47b3bda160e58058507d4a2f 100644
(file)
--- a/
rerere.c
+++ b/
rerere.c
@@
-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)