Merge branch 'cb/merge-recursive-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2009 08:09:27 +0000 (00:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2009 08:09:27 +0000 (00:09 -0800)
commita19528c...fd85454204ff76cd58923072c83594b1
tree3f88886...5eac7538098dcf5cca3b53e7148ab006copy hash to clipboard (tree)
parent960e0eb...eae8d1a5db754ebe44c0ccb414b855adcopy hash to clipboard (diff)
parent60c9118...faf33316211970cd2f332b39acb48399copy hash to clipboard (diff)