summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-10 22:26:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-10 22:26:06 (GMT)
commite5f767554404592cf65e7c49b3594b195a324031 (patch)
treec94786f10cc5820f7526bd88cecde58940c94979 /diff.c
parent45c0c21eb96ce45f05ffbe8600adf6ac65086415 (diff)
parent5580b271af518bae30148edfd42cc8459d8da384 (diff)
downloadgit-e5f767554404592cf65e7c49b3594b195a324031.zip
git-e5f767554404592cf65e7c49b3594b195a324031.tar.gz
git-e5f767554404592cf65e7c49b3594b195a324031.tar.bz2
Merge branch 'jk/diff-compact-heuristic'
It turns out that the earlier effort to update the heuristics may want to use a bit more time to mature. Turn it off by default. * jk/diff-compact-heuristic: diff: disable compaction heuristic for now
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 d3734d3..fa78fc1 100644
--- a/diff.c
+++ b/diff.c
@@ -26,7 +26,7 @@
#endif
static int diff_detect_rename_default;
-static int diff_compaction_heuristic = 1;
+static int diff_compaction_heuristic; /* experimental */
static int diff_rename_limit_default = 400;
static int diff_suppress_blank_empty;
static int diff_use_color_default = -1;