aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-14 12:37:28 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-14 12:37:28 -0700
commitadf59ec127f447aa83c84f9dbe2ae4e6417f3760 (patch)
tree6f18778312b98ea48205c127c1a07e967dc4c77b /diff.c
parent0bdf93cbf0afd568384f237378ba368e751a2f0f (diff)
parentb8960bbe7bdfc0b232462f916ee8151c83afd16f (diff)
downloadgit-adf59ec127f447aa83c84f9dbe2ae4e6417f3760.tar.gz
git-adf59ec127f447aa83c84f9dbe2ae4e6417f3760.tar.xz
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
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index e35384b44..439d4746c 100644
--- a/diff.c
+++ b/diff.c
@@ -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;