X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=unpack-trees.h;h=7c0187d11adaa5f0b9a8642070d8dfc2db41dfdf;hb=25c3936349ba052f0c7e9ba3ce138b89abcae6ee;hp=6e049b09977cf89eca87f5ef22e645dd2027e414;hpb=2d984464c6be7ced6772a8dcf95d6a461a659a78;p=git.git

diff --git a/unpack-trees.h b/unpack-trees.h
index 6e049b099..7c0187d11 100644
--- 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;