Merge branch 'mg/doc-word-diff-example' into maint
authorJeff King <peff@peff.net>
Tue, 1 Dec 2015 22:21:11 +0000 (17:21 -0500)
committerJeff King <peff@peff.net>
Tue, 1 Dec 2015 22:21:11 +0000 (17:21 -0500)
* mg/doc-word-diff-example:
Documentation/diff: give --word-diff-regex=. example

Trivial merge