Merge branch 'da/difftool-dir-diff-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:30 +0000 (14:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:30 +0000 (14:49 -0800)
commit935a478...f72964e0fa72995c101542531081b094
tree415bf03...10403d26e6d383f0df2054880bdde654copy hash to clipboard (tree)
parent28c8a44...dd4d6420fc08106efa1c288246b15845copy hash to clipboard (diff)
parent853e10c...9755669bd4695b1d9fd81f3278466727copy hash to clipboard (diff)