diff options
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")) |