Merge branch 'lt/setup' into __/setup-n-mv
commit7061cf0f205e86613c3a3306fdfedf2a5dcc8a65
authorJunio C Hamano <junkio@cox.net>
Sat, 29 Jul 2006 08:54:54 +0000 (29 01:54 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 29 Jul 2006 08:54:54 +0000 (29 01:54 -0700)
treee0595e44fc820032fd5ee942a031439f2e6da3b1
parentac64a722072bb348476a8a029de9a82073e07fba
parenta633fca0c056aa221d23493c276d3713191621b3
Merge branch 'lt/setup' into __/setup-n-mv

This merges the new built-in calling convention code into Johannes's
builtin-mv topic in order to resolve their conflicts early on.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Makefile
builtin-add.c
builtin-mv.c
builtin.h
git.c