pull: propagate --progress to merge

diff --git a/diff.h b/diff.h
index f774c9ab51221dac3d84ec75cd7787b1c8e3e3bf..9585e41aea3ba32b1132a6137151b66b22908c32 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -111,6 +111,7 @@ struct diff_options {
        int rename_score;
        int rename_limit;
        int needed_rename_limit;
+       int show_rename_progress;
        int dirstat_percent;
        int setup;
        int abbrev;