Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Feb 2017 21:36:03 +0000 (13:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Feb 2017 21:36:03 +0000 (13:36 -0800)
commita83c2d2...72b7821e45192df08142d27ebc51da48
tree06647fc...34262da86bee65a45477fecccd579f22copy hash to clipboard (tree)
parente66adca...fe63508dfd7410c2253116043894d298copy hash to clipboard (diff)
parent853e10c...9755669bd4695b1d9fd81f3278466727copy hash to clipboard (diff)
contrib/examples/git-difftool.perl
t/t7800-difftool.sh