X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=branch.c;h=dc23e954357c7e56d9232af7a8907ec4ed15b674;hb=a35138af75070adb32cf281a56186c9343af36a4;hp=93dc866f8c09a2da2308c4fd677178b043f2d4d5;hpb=fa1c8542cb3ed2a193aac2e514ebe12d7fe22a04;p=git.git

diff --git a/branch.c b/branch.c
index 93dc866f8..dc23e9543 100644
--- 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"));