Merge branch 'da/mergetool-meld' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Oct 2014 17:35:16 +0000 (10:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Oct 2014 17:35:16 +0000 (10:35 -0700)
commit9db1838...056c713eca8f53bff3bb409d23117f1d
treecc2563f...8b170c298e5a79e84b8809d02f4db639copy hash to clipboard (tree)
parentaf1b4e3...0f5f24e4fbc6f870c9e1552175b86b76copy hash to clipboard (diff)
parentb12d045...3b0aba1f2d68b164b348cbf94bbe570bcopy hash to clipboard (diff)