X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Frerere.c;h=39ad60169d6f4cd53e560e922410b48cc01f7886;hb=d3fd3d1f9bbb454864bd004dc3f29f99e4087889;hp=980d5421eee881ccb84c20dfb7aaae7dbb6a06ab;hpb=609eb9f7ff2af45d52ea90c0678a442d46aaa163;p=git.git

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