X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-rerere.c;h=adfb7b5f48597c19c23235b74cf1a0c779985dc6;hb=6d71c1dca4396de545a6c9667b3dcf0c03e42b30;hp=020af7377bb9aa1bced7489d40169e3cb2ff7682;hpb=13c5833c094e3d889df8e4a4f0ff30bb874c1b14;p=git.git

diff --git a/builtin-rerere.c b/builtin-rerere.c
index 020af7377..adfb7b5f4 100644
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -116,7 +116,7 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
 			if (!has_rerere_resolution(name))
 				unlink_rr_item(name);
 		}
-		unlink(git_path("rr-cache/MERGE_RR"));
+		unlink_or_warn(git_path("rr-cache/MERGE_RR"));
 	} else if (!strcmp(argv[1], "gc"))
 		garbage_collect(&merge_rr);
 	else if (!strcmp(argv[1], "status"))