Merge part of np/delta

author Junio C Hamano <junkio@cox.net>

Wed, 22 Feb 2006 08:57:43 +0000 (00:57 -0800)

committer Junio C Hamano <junkio@cox.net>

Wed, 22 Feb 2006 08:57:43 +0000 (00:57 -0800)
author Junio C Hamano <junkio@cox.net>
Wed, 22 Feb 2006 08:57:43 +0000 (00:57 -0800)
committer Junio C Hamano <junkio@cox.net>
Wed, 22 Feb 2006 08:57:43 +0000 (00:57 -0800)
diff --cc Makefile
Simple merge
diff --cc pack-objects.c
Simple merge
author	Junio C Hamano <junkio@cox.net>
	Wed, 22 Feb 2006 08:57:43 +0000 (00:57 -0800)
committer	Junio C Hamano <junkio@cox.net>
	Wed, 22 Feb 2006 08:57:43 +0000 (00:57 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
pack-objects.c	patch \|	diff1 \|	diff2 \|	blob \| history