Merge branch 'ks/difftool-dir-diff-copy-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:38:22 +0000 (14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:38:23 +0000 (14:38 -0700)
commit88f90f8...86e9e456ea332e00f87ad39892103544
treeadc94f5...7e6fa961ccfffb7197fc0df0b664e3a4copy hash to clipboard (tree)
parent6be17ec...828386c3ae17af26fac66f65f1c817eccopy hash to clipboard (diff)
parent32eaf1d...7f79c4ba09f3de3261c84e52e0a67af5copy hash to clipboard (diff)