Merge fixes up to GIT 1.2.3
authorJunio C Hamano <junkio@cox.net>
Thu, 23 Feb 2006 00:15:42 +0000 (16:15 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 23 Feb 2006 00:15:42 +0000 (16:15 -0800)
1  2 
sha1_file.c

diff --cc sha1_file.c
Simple merge