X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=rerere.c;h=87360dc23e54aabf47b3bda160e58058507d4a2f;hb=7f5a68ad4d0e00eb2f28405946ec0f2691d7ad81;hp=713c6e16ac536eaa667cc9f22768670be129483c;hpb=8146f19762c8fd67f6df3da4ba87a4e5ea880909;p=git.git

diff --git a/rerere.c b/rerere.c
index 713c6e16a..87360dc23 100644
--- 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)