Merge branch 'mk/rename'
authorJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:13:31 +0000 (19:13 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:13:31 +0000 (19:13 -0700)
1  2 
builtin-checkout-index.c
builtin-verify-pack.c
help.c

Simple merge
Simple merge
diff --cc help.c
Simple merge