Merge branch 'jn/ancient-meld-support' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 23:33:07 +0000 (15:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 23:33:07 +0000 (15:33 -0800)
commitbdf26fc...eabec0c2a785e5b14b9f3b4079cab0ea
tree9074c7a...81b7dbd3908132246d6392ef569933d8copy hash to clipboard (tree)
parent4eed30a...cb56dfd21917a3685eccb1d8321d852fcopy hash to clipboard (diff)
parent759a904...090b56a3941c1133a0f3302b7fec5054copy hash to clipboard (diff)