Merge branch 'dm/mergetool-vimdiff'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Oct 2010 04:47:11 +0000 (21:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Oct 2010 04:47:11 +0000 (21:47 -0700)
commit0141215...9b1b95b6b9619358ab13e0f56e1cd01c
treea3e096b...78f2c87cf694126df2a3d36ce600016bcopy hash to clipboard (tree)
parent91e811e...e80e55d580ba3601176ac84b28ad4479copy hash to clipboard (diff)
parent0008669...9a5d9233c89d8fcc33a8125cc84f24d6copy hash to clipboard (diff)