summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-14 23:48:48 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-14 23:56:27 -0700
commitebcffb1d44643bab69671abdf79209489e64dbef (patch)
treed451abfc0dad9e9f3c45eb3cdc247d1dc3f81710 /rerere.c
parent1864265c4d9afa374b27836ff0a3b3eb40144552 (diff)
parent0af0ac7ebbbd2afbc4399d5658e193460b4caaa3 (diff)
downloadgit-ebcffb1d44643bab69671abdf79209489e64dbef.tar.gz
Merge branch 'js/merge-rr'
* js/merge-rr: Move MERGE_RR from .git/rr-cache/ into .git/ Conflicts: builtin-rerere.c
Diffstat (limited to 'rerere.c')
-rw-r--r--rerere.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/rerere.c b/rerere.c
index eec2b50107..12589215e8 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;