summaryrefslogtreecommitdiff
path: root/builtin-merge-tree.c
AgeCommit message (Collapse)AuthorFilesLines
2010-01-22merge-tree: remove unnecessary call of git_extract_argv0_pathLibravatar Johannes Sixt1-2/+0
This call should have been removed when the utility was made a builtin by 907a7cb. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-21make "git merge-tree" a built-inLibravatar Linus Torvalds1-0/+360
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>