summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dedc0ec)
raw | patch | inline | side by side (parent: dedc0ec)
author | Johannes Sixt <j6t@kdbg.org> | |
Fri, 22 Jan 2010 11:47:59 +0000 (12:47 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 22 Jan 2010 18:01:06 +0000 (10:01 -0800) |
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>
907a7cb.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-merge-tree.c | patch | blob | history |
diff --git a/builtin-merge-tree.c b/builtin-merge-tree.c
index 8e16c3edade1438e7870e9575833da0e59448136..a4a4f2ce4c3f147062070c2acc08eaf9f4d40be8 100644 (file)
--- a/builtin-merge-tree.c
+++ b/builtin-merge-tree.c
if (argc != 4)
usage(merge_tree_usage);
- git_extract_argv0_path(argv[0]);
-
buf1 = get_tree_descriptor(t+0, argv[1]);
buf2 = get_tree_descriptor(t+1, argv[2]);
buf3 = get_tree_descriptor(t+2, argv[3]);