diff --git a/merge-recursive.h b/merge-recursive.h
index e63df9d63b23f2c5458620007ed6e770aa2b1047..be8410ad1803bc10e5dbf74f39eecdfed53469b1 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,