Merge fixes up to GIT 1.2.2
authorJunio C Hamano <junkio@cox.net>
Sun, 19 Feb 2006 06:55:42 +0000 (22:55 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 19 Feb 2006 06:55:42 +0000 (22:55 -0800)
1  2 
rev-parse.c
sha1_file.c

diff --cc rev-parse.c
Simple merge
diff --cc sha1_file.c
Simple merge