diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-10 11:10:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-10 11:10:14 -0800 |
| commit | 1a507b9cf75bcb2de2391c584539e0ff202549bf (patch) | |
| tree | 50013deffff4af5b2bade8332d1294f1c4ddbcd8 /builtin-merge.c | |
| parent | 4751f11224600ab25adb0a200fec55a734bc2936 (diff) | |
| parent | f01d74960363736caaf4d98d39555e99bdc72c25 (diff) | |
Merge branch 'jn/maint-http-fetch-mingw' into jn/help-everywhere
* jn/maint-http-fetch-mingw:
http-fetch: add missing initialization of argv0_path
merge: do not setup worktree twice
check-ref-format: update usage string
Conflicts:
builtin-check-ref-format.c
Diffstat (limited to 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index c69a3051f3..18571387f1 100644 --- 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()) |