pull: propagate --progress to merge

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