Merge branch 'dk/maint-blame-el' into maint

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