rerere.c: remove implicit dependency on the_index

diff --git a/builtin/merge.c b/builtin/merge.c
index 5f79fc5fd7a80103debbc812482f8cf0d7e8f9da..3c003ce7971436208f2e516e9c901aada04ba938 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -899,7 +899,7 @@ static int suggest_conflicts(void)
        fputs(msgbuf.buf, fp);
        strbuf_release(&msgbuf);
        fclose(fp);
-       rerere(allow_rerere_auto);
+       repo_rerere(the_repository, allow_rerere_auto);
        printf(_("Automatic merge failed; "
                        "fix conflicts and then commit the result.\n"));
        return 1;