X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=branch.c;h=b1e59f2196b933ab7169a30efc5d1d340f8f9c5c;hb=aaefbfa66c348a461b3081873ef42819c8b38dac;hp=56e949232cac1fe9dbe23aa93b50fe2f7c55c07d;hpb=0a02186f924aee1bd69f18ed01f645aa332ce0d1;p=git.git diff --git a/branch.c b/branch.c index 56e949232..b1e59f219 100644 --- a/branch.c +++ b/branch.c @@ -166,7 +166,7 @@ void create_branch(const char *head, void remove_branch_state(void) { unlink(git_path("MERGE_HEAD")); - unlink(git_path("rr-cache/MERGE_RR")); + unlink(git_path("MERGE_RR")); unlink(git_path("MERGE_MSG")); unlink(git_path("SQUASH_MSG")); }