Merge branch 'jk/diff-compact-heuristic'
commite5f767554404592cf65e7c49b3594b195a324031
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Jun 2016 22:26:06 +0000 (10 15:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Jun 2016 22:26:06 +0000 (10 15:26 -0700)
treec94786f10cc5820f7526bd88cecde58940c94979
parent45c0c21eb96ce45f05ffbe8600adf6ac65086415
parent5580b271af518bae30148edfd42cc8459d8da384
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
Documentation/diff-config.txt
Documentation/diff-options.txt
diff.c