Merge branch 'jc/skip-count'

author Junio C Hamano <junkio@cox.net>

Mon, 25 Dec 2006 11:27:41 +0000 (03:27 -0800)

committer Junio C Hamano <junkio@cox.net>

Mon, 25 Dec 2006 11:27:41 +0000 (03:27 -0800)
author Junio C Hamano <junkio@cox.net>
Mon, 25 Dec 2006 11:27:41 +0000 (03:27 -0800)
committer Junio C Hamano <junkio@cox.net>
Mon, 25 Dec 2006 11:27:41 +0000 (03:27 -0800)
diff --cc revision.c
Simple merge
diff --cc revision.h
Simple merge
author	Junio C Hamano <junkio@cox.net>
	Mon, 25 Dec 2006 11:27:41 +0000 (03:27 -0800)
committer	Junio C Hamano <junkio@cox.net>
	Mon, 25 Dec 2006 11:27:41 +0000 (03:27 -0800)
		1	2
revision.c	patch \|	diff1 \|	diff2 \|	blob \| history
revision.h	patch \|	diff1 \|	diff2 \|	blob \| history