mergetool: Skip autoresolved paths

[git.git] / builtin / rerere.c

diff --git a/builtin/rerere.c b/builtin/rerere.c
index 980d5421eee881ccb84c20dfb7aaae7dbb6a06ab..39ad60169d6f4cd53e560e922410b48cc01f7886 100644 (file)
--- 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"))