Merge branch 'jn/maint-http-fetch-mingw' into jn/help-everywhere

[thirdparty/git.git] / builtin-merge.c

diff --git a/builtin-merge.c b/builtin-merge.c
index c69a3051f38eb70f148015471d0c2df1df8db33b..18571387f11b0ce5b5131f4e3cedd5064fa8e492 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -843,7 +843,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())