Andrew's git / gitweb.git / diff
?
Merge branch 'js/difftool-builtin'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2017 20:52:25 +0000 (12:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2017 20:52:25 +0000 (12:52 -0800)
A few hot-fixes to C-rewrite of "git difftool".

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

1  2 
t/t7800-difftool.sh patch | diff1 | diff2 | blob | history
diff --cc t/t7800-difftool.sh
Simple merge