pull: propagate --progress to merge

diff --git a/merge-recursive.h b/merge-recursive.h
index 2eb5d1aad531a6ba822d74f1231859aec47c133b..59d1475be9239c57190620ed8c4df628dd24d4f8 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -19,6 +19,9 @@ struct merge_options {
        int verbosity;
        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;