Merge branch 'jc/mergetool-tool-help' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:30:18 +0000 (15:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:30:18 +0000 (15:30 -0700)
commitf52a386...f256fbea1618affd85cf62ad8283b2f7
tree05751e9...0605bdf0b26b47e92e01f1cb93ecc55bcopy hash to clipboard (tree)
parent0e4c882...e98e27c3c63125570c8bcbf0a8fd34dacopy hash to clipboard (diff)
parent109859e...7445a3ad12eb8f8cba43a5aa8f701733copy hash to clipboard (diff)