diff --git a/branch.c b/branch.c
index 56e949232cac1fe9dbe23aa93b50fe2f7c55c07d..b1e59f2196b933ab7169a30efc5d1d340f8f9c5c 100644 (file)
--- a/branch.c
+++ b/branch.c
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"));
}