Merge branch 'lt/prune'

author Junio C Hamano <junkio@cox.net>

Thu, 13 Jul 2006 05:31:55 +0000 (22:31 -0700)

committer Junio C Hamano <junkio@cox.net>

Thu, 13 Jul 2006 05:31:55 +0000 (22:31 -0700)
author Junio C Hamano <junkio@cox.net>
Thu, 13 Jul 2006 05:31:55 +0000 (22:31 -0700)
committer Junio C Hamano <junkio@cox.net>
Thu, 13 Jul 2006 05:31:55 +0000 (22:31 -0700)
diff --cc Makefile
Simple merge
diff --cc git.c
Simple merge
author	Junio C Hamano <junkio@cox.net>
	Thu, 13 Jul 2006 05:31:55 +0000 (22:31 -0700)
committer	Junio C Hamano <junkio@cox.net>
	Thu, 13 Jul 2006 05:31:55 +0000 (22:31 -0700)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
git.c	patch \|	diff1 \|	diff2 \|	blob \| history