Merge branch 'jk/strbuf-vaddf'

diff --git a/builtin/merge.c b/builtin/merge.c
index a89ddbb65578182d1d0cbd9b0104889a6dc05ac8..b4746ee55b389d35a842c0471336f2e22a003430 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -999,6 +999,13 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                else
                        die("You have not concluded your merge (MERGE_HEAD exists).");
        }
+       if (file_exists(git_path("CHERRY_PICK_HEAD"))) {
+               if (advice_resolve_conflict)
+                       die("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+                           "Please, commit your changes before you can merge.");
+               else
+                       die("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).");
+       }
        resolve_undo_clear();
 
        if (verbosity < 0)