Merge branch 'js/merge-rr'

[git.git] / rerere.c

diff --git a/rerere.c b/rerere.c
index eec2b501072a44f34093cc48acd2c2d5020f04b1..12589215e867bff37d5f2848083e8f138331e8ee 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -342,7 +342,7 @@ int setup_rerere(struct path_list *merge_rr)
        if (!is_rerere_enabled())
                return -1;
 
-       merge_rr_path = xstrdup(git_path("rr-cache/MERGE_RR"));
+       merge_rr_path = xstrdup(git_path("MERGE_RR"));
        fd = hold_lock_file_for_update(&write_lock, merge_rr_path, 1);
        read_rr(merge_rr);
        return fd;