Merge branch 'jg/mergetool'
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 01:43:28 +0000 (17:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 01:43:28 +0000 (17:43 -0800)
commit2edefe3...a813deb4dfbd62dcf47520aeb1af15fc
treeeb3b241...33eb2abda586b947825a7d1cf5f1ca6acopy hash to clipboard (tree)
parentddebfd1...27110bbcd0e8da0417bc425509af219acopy hash to clipboard (diff)
parentfb700cb...679e22900f0d1435641e6cf7c652968bcopy hash to clipboard (diff)