Fix earlier mismerges.
authorJunio C Hamano <junkio@cox.net>
Sun, 4 Jun 2006 07:10:48 +0000 (00:10 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 4 Jun 2006 07:10:48 +0000 (00:10 -0700)
Signed-off-by: Junio C Hamano <junkio@cox.net>
No differences found