Merge branch 'jn/ancient-meld-support'
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 20:57:17 +0000 (12:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 20:57:17 +0000 (12:57 -0800)
commit746b6fb...6852accae8a4163f6edda23a4c6de0c7
treeadf9a48...ba9e9c2a8c6378edba0b7bf652ca5b0bcopy hash to clipboard (tree)
parent63d37c3...62e13cb2828edf63bc03cce1b6c41fd0copy hash to clipboard (diff)
parent759a904...090b56a3941c1133a0f3302b7fec5054copy hash to clipboard (diff)