summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
Diffstat (limited to 'merge-tree.c')
-rw-r--r--merge-tree.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/merge-tree.c b/merge-tree.c
index 2d1413efbb..f01e7c81ae 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]);