diff options
-rw-r--r-- | lib/commit.tcl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/commit.tcl b/lib/commit.tcl index 78c5eeb7bc..864b687057 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -409,6 +409,7 @@ A rescan will be automatically started now. catch {file delete [gitdir MERGE_MSG]} catch {file delete [gitdir SQUASH_MSG]} catch {file delete [gitdir GITGUI_MSG]} + catch {file delete [gitdir CHERRY_PICK_HEAD]} # -- Let rerere do its thing. # |