Merge part of np/delta
authorJunio C Hamano <junkio@cox.net>
Wed, 22 Feb 2006 08:57:43 +0000 (00:57 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 22 Feb 2006 08:57:43 +0000 (00:57 -0800)
1  2 
Makefile
pack-objects.c

diff --cc Makefile
Simple merge
diff --cc pack-objects.c
Simple merge