Merge branch 'js/merge-rr'

* js/merge-rr:
  Move MERGE_RR from .git/rr-cache/ into .git/

Conflicts:
	builtin-rerere.c

1 files changed, 1 insertions, 1 deletions

diff --git a/rerere.c b/rerere.c
index eec2b5010..12589215e 100644
--- 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;