pull: propagate --progress to merge

diff --git a/merge-recursive.h b/merge-recursive.h
index 54420f15560310cdaf695a0b89133465f2bc52ec..59d1475be9239c57190620ed8c4df628dd24d4f8 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -20,15 +20,14 @@ struct merge_options {
        int diff_rename_limit;
        int merge_rename_limit;
        int rename_score;
+       int needed_rename_limit;
+       int show_rename_progress;
        int call_depth;
        struct strbuf obuf;
        struct string_list current_file_set;
        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,