From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Feb 2017 20:52:25 +0000 (-0800)
Subject: Merge branch 'js/difftool-builtin'
X-Git-Tag: v2.12.0-rc1~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=163d24dc4d914191d1981ed0d9fa2a5d91b7d412;p=thirdparty%2Fgit.git

Merge branch 'js/difftool-builtin'

A few hot-fixes to C-rewrite of "git difftool".

* js/difftool-builtin:
  t7800: simplify basic usage test
  difftool: fix bug when printing usage
---

163d24dc4d914191d1981ed0d9fa2a5d91b7d412