Merge branch 'jk/difftool-dir-diff-edit-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Mar 2013 21:37:22 +0000 (14:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Mar 2013 21:37:22 +0000 (14:37 -0700)
commit18973d8...c9e396d0eefdf36d7c6aa43aa7d396a6
tree3dbfedd...e403353b393042a812cfa2c669e54fbfcopy hash to clipboard (tree)
parentd8355e5...aecddbcafdd66aa3d6433ae12f627177copy hash to clipboard (diff)
parent02c5631...aab9474827cd7831518a970f0341e4fdcopy hash to clipboard (diff)
git-difftool.perl
t/t7800-difftool.sh