Merge branch 'cj/p4merge' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:44:46 +0000 (10:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:44:46 +0000 (10:44 -0700)
commite82c746...8b24ddaad56f085f66c90da7ad7a0cb5
tree33f7342...8a21c6b5b4fba0bd7be832ae14dfda05copy hash to clipboard (tree)
parent8272bca...ac0b68e6d526ec0fcbc6d6e532b3e2afcopy hash to clipboard (diff)
parent0a0ec7b...66786bcc2204f299f6c993db19d1f53ccopy hash to clipboard (diff)