Git 1.6.6-rc1

diff --git a/merge-recursive.h b/merge-recursive.h
index fd138ca14006843a7ce0c38cfde4de580d5ce36e..d8bc7299ee3a70484b2436afd3799fe6f7608422 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -17,6 +17,9 @@ struct merge_options {
        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,