Merge branch 'da/difftool-mergtool-refactor'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2011 23:00:43 +0000 (16:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2011 23:00:43 +0000 (16:00 -0700)
commit3f1c70f...17da3c9ec6ae3744593c7f9f3729aad7
tree2ae895e...a594851c845af80b4d60cd584e59f0b6copy hash to clipboard (tree)
parent9bf0eed...1d789fecbc9959e2c2122d34c123863ccopy hash to clipboard (diff)
parentf61bd9c...8a4ed81afcc1fbbf5b956e781d88b434copy hash to clipboard (diff)
Makefile