Merge 1.5.0.7 in
authorJunio C Hamano <junkio@cox.net>
Wed, 4 Apr 2007 04:52:14 +0000 (21:52 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 4 Apr 2007 04:52:14 +0000 (21:52 -0700)
commit045f5759c97746589a067461e50fad16f60711ac
tree3eaaef6c395bbe17ca26620dc98fb6b128721640
parent04483524ecfe67e4d4f120b0bf6d91b43a02d40a
parent9694ec4533b30c1299e9ce7742c65c78b4fa3c5d
Merge 1.5.0.7 in

Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-rerere.c
t/t4200-rerere.sh