Merge branch 'jk/renamelimit' (early part)

* 'jk/renamelimit' (early part):
diff: make "too many files" rename warning optional
bump rename limit defaults
add merge.renamelimit config option

diff --combined diff.c
index e35384b4442fbaedbf460ddf61c32b85dde2a4d7,f7355191dde978c057ca0c56fc1aa98db4ebcc02..439d4746cae343f08b298473d35d9792048abfa0
--- 1/diff.c
--- 2/diff.c
+++ b/diff.c
@@@ -19,7 -19,7 +19,7 @@@
  #endif
  
  static int diff_detect_rename_default;
- static int diff_rename_limit_default = 100;
+ static int diff_rename_limit_default = 200;
  int diff_use_color_default = -1;
  static const char *external_diff_cmd_cfg;
  int diff_auto_refresh_index = 1;
@@@ -2220,6 -2220,7 +2220,6 @@@ void diff_setup(struct diff_options *op
        options->rename_limit = -1;
        options->dirstat_percent = 3;
        options->context = 3;
 -      options->msg_sep = "";
  
        options->change = diff_change;
        options->add_remove = diff_addremove;

diff --combined diff.h
index 1bd94a4807c741e7cb2e4d8eb9f6476eba691388,893111606826d600dacc6789cea319ce088e14c6..3a02d38d12d94c39ff9ef3ab744ea7d157fb52b4
--- 1/diff.h
--- 2/diff.h
+++ b/diff.h
@@@ -83,11 -83,13 +83,12 @@@ struct diff_options 
        int pickaxe_opts;
        int rename_score;
        int rename_limit;
+       int warn_on_too_large_rename;
        int dirstat_percent;
        int setup;
        int abbrev;
        const char *prefix;
        int prefix_length;
 -      const char *msg_sep;
        const char *stat_sep;
        long xdl_opts;