Merge branch 'dp/checkattr'

[git.git] / branch.c

diff --git a/branch.c b/branch.c
index b1e59f2196b933ab7169a30efc5d1d340f8f9c5c..205b89dc697eb4475355ab5b2a6528e404901c0c 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -168,5 +168,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"));
 }