OSDN Git Service

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)
commit0ffe1c9c5f2ee6e2efeccff6cf67674130a9c39a
tree90d9f935221147a2c4c2a09ebfd55be587f26c3d
parent163d24dc4d914191d1981ed0d9fa2a5d91b7d412
parent56c2da57fe578d8cb4c6b4fd7d08669944976c35
Merge branch 'dl/difftool-doc-no-gui-option'

Doc update.

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