pull: propagate --progress to merge

diff --git a/diff.c b/diff.c
index 5422c438826254f36d1e00af0e8b882690661276..869cca7536625976e958c48b3c04d1f4bfdcacbb 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -23,7 +23,7 @@
 #endif
 
 static int diff_detect_rename_default;
-static int diff_rename_limit_default = 200;
+static int diff_rename_limit_default = 400;
 static int diff_suppress_blank_empty;
 int diff_use_color_default = -1;
 static const char *diff_word_regex_cfg;