Merge branch 'mm/doc-word-diff' into jch

The documentation for "--word-diff" has been extended with a bit of
implementation detail of where these different words come from.

* mm/doc-word-diff:
  doc: clarify that --word-diff operates on line-level hunks

diff --cc Documentation/diff-options.adoc
Simple merge