Commit graph

2 commits

Author SHA1 Message Date
Johannes Sixt 07c0732067 merge-tree: remove unnecessary call of git_extract_argv0_path
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-22 10:01:06 -08:00
Linus Torvalds 907a7cb51c make "git merge-tree" a built-in
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-21 20:06:58 -08:00
Renamed from merge-tree.c (Browse further)