Merge part of 'jc/diff' into next

author Junio C Hamano <junkio@cox.net>

Wed, 1 Mar 2006 09:36:29 +0000 (01:36 -0800)

committer Junio C Hamano <junkio@cox.net>

Wed, 1 Mar 2006 09:36:29 +0000 (01:36 -0800)
author Junio C Hamano <junkio@cox.net>
Wed, 1 Mar 2006 09:36:29 +0000 (01:36 -0800)
committer Junio C Hamano <junkio@cox.net>
Wed, 1 Mar 2006 09:36:29 +0000 (01:36 -0800)
diff --cc Makefile
Simple merge
diff --cc diffcore.h
Simple merge
author	Junio C Hamano <junkio@cox.net>
	Wed, 1 Mar 2006 09:36:29 +0000 (01:36 -0800)
committer	Junio C Hamano <junkio@cox.net>
	Wed, 1 Mar 2006 09:36:29 +0000 (01:36 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
diffcore.h	patch \|	diff1 \|	diff2 \|	blob \| history