Merge branch 'jc/test-3402'
authorJunio C Hamano <junkio@cox.net>
Fri, 30 Jun 2006 06:47:59 +0000 (23:47 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 30 Jun 2006 06:47:59 +0000 (23:47 -0700)
* jc/test-3402:
Racy GIT (part #3)

Trivial merge