diff options
| author | Jay Soffian <jaysoffian@gmail.com> | 2010-07-14 21:18:11 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-15 00:04:25 +0400 |
| commit | 3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3 (patch) | |
| tree | 5a6087ccd95cf00c8e23e8b325964ef78ca2046d /builtin | |
| parent | 1b79d1c2a8a90419238f7213870ab1dc465082fe (diff) | |
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')
| -rw-r--r-- | builtin/rerere.c | 2 |
1 files changed, 1 insertions, 1 deletions
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")) |