From: Jeff King <peff@peff.net>
Date: Tue, 1 Dec 2015 22:21:11 +0000 (-0500)
Subject: Merge branch 'mg/doc-word-diff-example' into maint
X-Git-Tag: v2.6.4~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cc36407df4eb919c4ad3da0561d1bbdb9e0c0c4;p=thirdparty%2Fgit.git

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

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

2cc36407df4eb919c4ad3da0561d1bbdb9e0c0c4