Merge branch 'cn/diff-indent-no-longer-is-experimental' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:05:04 +0000 (12:05 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:05:04 +0000 (12:05 +0900)
commitda2b4ee3888d3df7dad6df5d0e5d2d8d3fa09746
treedc9f1a979f9f960ab2962104fe69340bebc12a85
parent74ef46558ea98f4e24d1016c9961eb3d0d372be2
parentbab76141da04ab094ece449e2127ef43a8fa60c8
Merge branch 'cn/diff-indent-no-longer-is-experimental' into maint

Doc update.

* cn/diff-indent-no-longer-is-experimental:
  diff: --indent-heuristic is no longer experimental
Documentation/diff-options.txt