Merge branch 'jk/difftool-in-subdir' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Aug 2016 16:16:57 +0000 (09:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Aug 2016 16:16:57 +0000 (09:16 -0700)
commit9b601ea...d1437df2e11b032bfbfd1ac5d32d3290
treefa93de5...b9cce0e537da90bd947e817f9af6cd43copy hash to clipboard (tree)
parentf4fd627...619dfe7cf9a024730ca65b1bd0b3492bcopy hash to clipboard (diff)
parent32b8c58...ecf35e73bebe2c6e9f6de617807b7f91copy hash to clipboard (diff)
t/t7800-difftool.sh