Merge branch 'dl/difftool-doc-no-gui-option'
authorJunio C Hamano <redacted>
Fri, 10 Feb 2017 20:52:26 +0000 (12:52 -0800)
committerJunio C Hamano <redacted>
Fri, 10 Feb 2017 20:52:26 +0000 (12:52 -0800)
Doc update.

* dl/difftool-doc-no-gui-option:
  Document the --no-gui option in difftool


Trivial merge
git clone https://git.99rst.org/PROJECT