Merge branch 'mk/rename'

author Junio C Hamano <redacted>

Sun, 13 Aug 2006 02:13:31 +0000 (19:13 -0700)

committer Junio C Hamano <redacted>

Sun, 13 Aug 2006 02:13:31 +0000 (19:13 -0700)
author Junio C Hamano <redacted>
Sun, 13 Aug 2006 02:13:31 +0000 (19:13 -0700)
committer Junio C Hamano <redacted>
Sun, 13 Aug 2006 02:13:31 +0000 (19:13 -0700)
diff --cc builtin-checkout-index.c
Simple merge
diff --cc builtin-verify-pack.c
Simple merge
diff --cc help.c
Simple merge
author	Junio C Hamano <redacted>
	Sun, 13 Aug 2006 02:13:31 +0000 (19:13 -0700)
committer	Junio C Hamano <redacted>
	Sun, 13 Aug 2006 02:13:31 +0000 (19:13 -0700)
		1	2
builtin-checkout-index.c	patch \|	diff1 \|	diff2 \|	blob \| history
builtin-verify-pack.c	patch \|	diff1 \|	diff2 \|	blob \| history
help.c	patch \|	diff1 \|	diff2 \|	blob \| history