diff options
| -rw-r--r-- | git-gui/lib/merge.tcl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl index 460d32fa2..5ab6f8f10 100644 --- a/git-gui/lib/merge.tcl +++ b/git-gui/lib/merge.tcl @@ -112,12 +112,7 @@ method _start {} { close $fh set _last_merged_branch $branch - set cmd [list git] - lappend cmd merge - lappend cmd --strategy=recursive - lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]] - lappend cmd HEAD - lappend cmd $name + set cmd [list git merge --strategy=recursive FETCH_HEAD] ui_status [mc "Merging %s and %s..." $current_branch $stitle] set cons [console::new [mc "Merge"] "merge $stitle"] |