Merge branch 'dl/difftool-doc-no-gui-option'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2017 20:52:26 +0000 (12:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
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