Merge branch 'jc/mergetool-tool-help'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2012 21:05:26 +0000 (14:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2012 21:05:26 +0000 (14:05 -0700)
commitcf78648...7c12c396ad5927cb6c0bbaa790cda7ad
tree93c489a...a4bfb1fde21851d3b9154990ec528b9acopy hash to clipboard (tree)
parent9c3f19f...fd7b8d7fcbebf05d30a8a41054f89d32copy hash to clipboard (diff)
parent109859e...7445a3ad12eb8f8cba43a5aa8f701733copy hash to clipboard (diff)