summaryrefslogtreecommitdiff
path: root/builtin/rerere.c
diff options
context:
space:
mode:
authorJay Soffian <jaysoffian@gmail.com>2010-07-14 17:18:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-14 20:04:25 (GMT)
commit3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3 (patch)
tree5a6087ccd95cf00c8e23e8b325964ef78ca2046d /builtin/rerere.c
parent1b79d1c2a8a90419238f7213870ab1dc465082fe (diff)
downloadgit-3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3.zip
git-3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3.tar.gz
git-3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3.tar.bz2
MERGE_RR is in .git, not .git/rr-cache
0af0ac7 (Move MERGE_RR from .git/rr-cache/ into .git/) moved the location of MERGE_RR but I found a few references to the old location. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rerere.c')
-rw-r--r--builtin/rerere.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rerere.c b/builtin/rerere.c
index 0048f9e..1207cb1 100644
--- 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"))