X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.h;h=34492dbd6ea22d715c98acbeeabe04033ff9a794;hb=835d6a1f9f6f0f6e47cf32238af7ee8b8d048d78;hp=196f0531062a095d57afc92c16c57a67ec93f31c;hpb=9502751181df4a1347b3bd0fe2f0f0cde9cfaa91;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index 196f05310..34492dbd6 100644
--- 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,