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
This commit is contained in:
Junio C Hamano
2016-06-10 15:26:06 -07:00
3 changed files with 13 additions and 1 deletions

2
diff.c
View File

@ -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;