X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-tree.c;h=f01e7c81aebea84b95154c9076af66979e52715f;hb=ce61595ea7eb3df22f6a943a38a273141f1af978;hp=2d1413efbbc33c51fd4820933dcb54164e12d706;hpb=acb0b7b01f64cf55d508b469eb2a351359c0cd82;p=git.git

diff --git a/merge-tree.c b/merge-tree.c
index 2d1413efb..f01e7c81a 100644
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -2,8 +2,9 @@
 #include "tree-walk.h"
 #include "xdiff-interface.h"
 #include "blob.h"
+#include "exec_cmd.h"
 
-static const char merge_tree_usage[] = "git-merge-tree <base-tree> <branch1> <branch2>";
+static const char merge_tree_usage[] = "git merge-tree <base-tree> <branch1> <branch2>";
 static int resolve_directories = 1;
 
 struct merge_list {
@@ -344,6 +345,8 @@ int main(int argc, char **argv)
 	if (argc != 4)
 		usage(merge_tree_usage);
 
+	git_extract_argv0_path(argv[0]);
+
 	setup_git_directory();
 
 	buf1 = get_tree_descriptor(t+0, argv[1]);