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)
Doc update.

* cn/diff-indent-no-longer-is-experimental:
  diff: --indent-heuristic is no longer experimental

1  2 
Documentation/diff-options.txt

Simple merge