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

Junio C Hamano committed Feb 10, 2017 at 12:52 UTC 163d24dc4d914191d1981ed0d9fa2a5d91b7d412

No changes.