Fix earlier mismerges.
commitb266b123cd3124497a1d006cb126033ce458a85c
authorJunio C Hamano <junkio@cox.net>
Sun, 4 Jun 2006 07:10:48 +0000 (4 00:10 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 4 Jun 2006 07:10:48 +0000 (4 00:10 -0700)
treebd553f3956bb80a96d8b0d12e78148aab99db0ad
parent0e84fb06a1022f99c96cfcd728e7bf029ef0b5e3
Fix earlier mismerges.

Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-read-tree.c