Merge branch 'da/difftool-dir-diff-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:33 +0000 (14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:33 +0000 (14:45 -0800)
commitafe0e2a...91665c01daae78d8f8a9a105420b0218
treeea929bc...bdaff887cf0df53e102bec6979162e14copy hash to clipboard (tree)
parentc89606f...9043910c5f467eb0d152df1c463710becopy hash to clipboard (diff)
parent853e10c...9755669bd4695b1d9fd81f3278466727copy hash to clipboard (diff)