Merge branch 'fc/mergetools-vimdiff3'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:43 +0000 (12:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:43 +0000 (12:06 -0700)
commit3a9dae7...3bb66c18409d42d07949456dde8c4c62
tree740007c...3c8d057559a5bc112142e55a5fcacb50copy hash to clipboard (tree)
parentb8ef69f...2e837d78250555807073b5405f7c9297copy hash to clipboard (diff)
parent7c147b7...d34f072c40b912fafba499727921fa6ecopy hash to clipboard (diff)