pull: propagate --progress to merge

diff --git a/merge-recursive.c b/merge-recursive.c
index 2ecd456c28e435572916c304d432dc4dd2ca12c2..6c8f95771231e0b0d5400e6c4b9af17fffeedbe7 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -439,8 +439,9 @@ static struct string_list *get_renames(struct merge_options *o,
        opts.detect_rename = DIFF_DETECT_RENAME;
        opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
                            o->diff_rename_limit >= 0 ? o->diff_rename_limit :
-                           500;
+                           1000;
        opts.rename_score = o->rename_score;
+       opts.show_rename_progress = o->show_rename_progress;
        opts.output_format = DIFF_FORMAT_NO_OUTPUT;
        if (diff_setup_done(&opts) < 0)
                die("diff setup failed");