diff --git a/merge-recursive.h b/merge-recursive.h
index c5fbe796bb799d02d115420d16657788acc1f0d8..34492dbd6ea22d715c98acbeeabe04033ff9a794 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
struct string_list current_directory_set;
};
-/* Return a list of user-friendly error messages to be used by merge */
-struct unpack_trees_error_msgs get_porcelain_error_msgs(void);
-
/* merge_trees() but with recursive ancestor consolidation */
int merge_recursive(struct merge_options *o,
struct commit *h1,