diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-10 20:36:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-10 20:36:26 (GMT) |
| commit | 8ac7a77be668180d515e234d550cc661aa0c1ebd (patch) | |
| tree | 8aa4710a131dbfd0722de487bcf91914882e39cd /builtin-merge.c | |
| parent | 6a93158c334fae92c5ca969cd0d0725c90af6b54 (diff) | |
| parent | d629c40b0b8b63b0c8b33d52dcba0ed202d898d7 (diff) | |
| download | git-8ac7a77be668180d515e234d550cc661aa0c1ebd.zip git-8ac7a77be668180d515e234d550cc661aa0c1ebd.tar.gz git-8ac7a77be668180d515e234d550cc661aa0c1ebd.tar.bz2 | |
Merge branch 'maint'
* maint:
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 1ff7b15..c8d7bde 100644 --- 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()) |