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