Merge branch 'fix'

author Junio C Hamano <junkio@cox.net>

Sun, 14 May 2006 23:20:15 +0000 (16:20 -0700)

committer Junio C Hamano <junkio@cox.net>

Sun, 14 May 2006 23:20:15 +0000 (16:20 -0700)
author Junio C Hamano <junkio@cox.net>
Sun, 14 May 2006 23:20:15 +0000 (16:20 -0700)
committer Junio C Hamano <junkio@cox.net>
Sun, 14 May 2006 23:20:15 +0000 (16:20 -0700)
diff --cc pack-objects.c
Simple merge
diff --cc sha1_file.c
Simple merge
author	Junio C Hamano <junkio@cox.net>
	Sun, 14 May 2006 23:20:15 +0000 (16:20 -0700)
committer	Junio C Hamano <junkio@cox.net>
	Sun, 14 May 2006 23:20:15 +0000 (16:20 -0700)
		1	2
pack-objects.c	patch \|	diff1 \|	diff2 \|	blob \| history
sha1_file.c	patch \|	diff1 \|	diff2 \|	blob \| history