Merge branch 'maint'

diff --git a/builtin-merge.c b/builtin-merge.c
index 1ff7b15803fef8791c5c47209ba6f983d59f3065..c8d7bdecc4e91392fa9e2614a6b9790e48fc0abd 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -846,7 +846,6 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
        const char *best_strategy = NULL, *wt_strategy = NULL;
        struct commit_list **remotes = &remoteheads;
 
-       setup_work_tree();
        if (file_exists(git_path("MERGE_HEAD")))
                die("You have not concluded your merge. (MERGE_HEAD exists)");
        if (read_cache_unmerged())