Merge branch 'jk/difftool-in-subdir'
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:48:39 +0000 (14:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:48:39 +0000 (14:48 -0700)
commit7647537...3e8f263306e22cb22b4f4f7b09589b19
treefc3ace2...e023a86be36d7f3438cd4644ffb5372dcopy hash to clipboard (tree)
parent768eded...9c4e804ead6d473d4fe3a8092a77b05ccopy hash to clipboard (diff)
parent32b8c58...ecf35e73bebe2c6e9f6de617807b7f91copy hash to clipboard (diff)
t/t7800-difftool.sh