summaryrefslogtreecommitdiff
path: root/branch.c
diff options
context:
space:
mode:
Diffstat (limited to 'branch.c')
-rw-r--r--branch.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/branch.c b/branch.c
index 6a75057..b1ac837 100644
--- a/branch.c
+++ b/branch.c
@@ -170,5 +170,6 @@ void remove_branch_state(void)
unlink(git_path("MERGE_HEAD"));
unlink(git_path("MERGE_RR"));
unlink(git_path("MERGE_MSG"));
+ unlink(git_path("MERGE_MODE"));
unlink(git_path("SQUASH_MSG"));
}