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