summaryrefslogtreecommitdiff
path: root/builtin-merge-index.c
AgeCommit message (Collapse)Author
2010-01-22make "merge-index" a built-inLinus Torvalds
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>