From 3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3 Mon Sep 17 00:00:00 2001 From: Jay Soffian Date: Wed, 14 Jul 2010 13:18:11 -0400 Subject: 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 Signed-off-by: Junio C Hamano --- builtin/rerere.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin/rerere.c') diff --git a/builtin/rerere.c b/builtin/rerere.c index 0048f9ef7f..1207cb1ea5 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")) -- cgit v1.2.1