Merge branch 'jp/send-email-to-cmd'

diff --git a/unpack-trees.h b/unpack-trees.h
index 6e049b09977cf89eca87f5ef22e645dd2027e414..7c0187d11adaa5f0b9a8642070d8dfc2db41dfdf 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -22,6 +22,13 @@ enum unpack_trees_error_types {
        NB_UNPACK_TREES_ERROR_TYPES
 };
 
+/*
+ * Sets the list of user-friendly error messages to be used by the
+ * command "cmd" (either merge or checkout), and show_all_errors to 1.
+ */
+void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
+                                 const char *cmd);
+
 struct rejected_paths_list {
        char *path;
        struct rejected_paths_list *next;