Merge branch 'dl/difftool-doc-no-gui-option'

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

Junio C Hamano committed Feb 10, 2017 at 12:52 UTC 0ffe1c9c5f2ee6e2efeccff6cf67674130a9c39a

No changes.