git-svn: check_cherry_pick should exclude commits already in our history

diff --git a/merge-recursive.h b/merge-recursive.h
index 196f0531062a095d57afc92c16c57a67ec93f31c..34492dbd6ea22d715c98acbeeabe04033ff9a794 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -24,12 +24,6 @@ struct merge_options {
        struct string_list current_directory_set;
 };
 
-/*
- * Sets the list of user-friendly error messages to be used by the
- * command "cmd" (either merge or checkout)
- */
-void set_porcelain_error_msgs(const char **msgs, const char *cmd);
-
 /* merge_trees() but with recursive ancestor consolidation */
 int merge_recursive(struct merge_options *o,
                    struct commit *h1,