Merge branch 'sp/maint-smart-http-sans-100-continue'

[git.git] / branch.c

diff --git a/branch.c b/branch.c
index 93dc866f8c09a2da2308c4fd677178b043f2d4d5..dc23e954357c7e56d9232af7a8907ec4ed15b674 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -217,6 +217,7 @@ void create_branch(const char *head,
 
 void remove_branch_state(void)
 {
+       unlink(git_path("CHERRY_PICK_HEAD"));
        unlink(git_path("MERGE_HEAD"));
        unlink(git_path("MERGE_RR"));
        unlink(git_path("MERGE_MSG"));