git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dir

diff --git a/branch.c b/branch.c
index 6a750574fd376e4d54e4ef2576674d42521f1529..b1ac837f3d30c826ddbe29492b906bf2d0de0a1a 100644 (file)
--- 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"));
 }