Merge branch 'mg/doc-word-diff-example' into maint

* mg/doc-word-diff-example: Documentation/diff: give --word-diff-regex=. example

Jeff King committed Dec 1, 2015 at 17:21 UTC 2cc36407df4eb919c4ad3da0561d1bbdb9e0c0c4

No changes.