make "merge-index" a built-in
commit0ecace728f8e48b87f81433b053d7f277f22e674
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jan 2010 15:29:21 +0000 (22 07:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Jan 2010 18:01:21 +0000 (22 10:01 -0800)
treebb7fba5beef76521154779bc8aa90c0dbe59ddd9
parent07c073206798483c9916d492dfc6faf7400a50ad
make "merge-index" a built-in

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Makefile
builtin-merge-index.c [moved from merge-index.c with 94% similarity]
builtin.h
git.c