diff options
Diffstat (limited to 'branch.c')
-rw-r--r-- | branch.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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")); } |