X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=branch.c;h=c0c865a4b1b0fca038f32b77f2239d7987438ff5;hb=a8d3d265450d8fc2c14a4bcd2f16d28d4ea0196b;hp=da5c03e56545b79cb92dd850ed09e81c21f9162f;hpb=b7f6afe2df4f15e03b02217dbe4f2df182308d10;p=git.git

diff --git a/branch.c b/branch.c
index da5c03e56..c0c865a4b 100644
--- a/branch.c
+++ b/branch.c
@@ -222,6 +222,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"));