Sync with 1.6.1.2
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Jan 2009 08:32:52 +0000 (00:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Jan 2009 08:32:52 +0000 (00:32 -0800)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1  2 
sha1_file.c

diff --cc sha1_file.c
Simple merge