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

Junio C Hamano committed Nov 15, 2017 at 12:05 UTC da2b4ee3888d3df7dad6df5d0e5d2d8d3fa09746

No changes.