Merge branch 'cn/diff-indent-no-longer-is-experimental'
commit662ac3b3a8a16fd749b598c85c4d8bfea5bb208e
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Nov 2017 04:11:27 +0000 (6 13:11 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Nov 2017 04:11:27 +0000 (6 13:11 +0900)
treedf06d7c450c987d4f94c8e5b9ae1ccf109ef077d
parent2502f018f4cc514b75bdd50c20695d8a35e1d0b5
parentbab76141da04ab094ece449e2127ef43a8fa60c8
Merge branch 'cn/diff-indent-no-longer-is-experimental'

Doc update.

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