From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Feb 2017 20:52:26 +0000 (-0800)
Subject: Merge branch 'dl/difftool-doc-no-gui-option'
X-Git-Tag: v2.12.0-rc1~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ffe1c9c5f2ee6e2efeccff6cf67674130a9c39a;p=thirdparty%2Fgit.git

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

Doc update.

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

0ffe1c9c5f2ee6e2efeccff6cf67674130a9c39a