diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-15 23:08:36 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-15 23:08:36 +0400 |
| commit | 4bd874c8f30d55b6189dacf1d769855ed2df4299 (patch) | |
| tree | b449d8155f4148e1afe5c7c9c99553bf85fcab14 /builtin/rerere.c | |
| parent | 4cd1b99c32d9a345438d098f37e75077d072778f (diff) | |
| parent | 3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3 (diff) | |
Merge branch 'js/merge-rr-fix'
* js/merge-rr-fix:
MERGE_RR is in .git, not .git/rr-cache
Diffstat (limited to 'builtin/rerere.c')
| -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 980d5421eee..39ad60169d6 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")) |