X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=builtin%2Frerere.c;h=9b1e3a7cf50674ffdd834d08edba184f5c7c285d;hb=6b5005c88b3a0c360249deb8ca8b92201abaa824;hp=3c8e45843e148758fece8b64015754b7d56ec6d1;hpb=183113a5ca99cb228b2ba0a29e53f1ac11f2c7c2;p=thirdparty%2Fgit.git

diff --git a/builtin/rerere.c b/builtin/rerere.c
index 3c8e45843e..9b1e3a7cf5 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"))