Merge branch 'rs/use-modern-git-merge-syntax' into pu

diff --git a/lib/merge.tcl b/lib/merge.tcl
index 460d32fa22fc77f6621e5ec9a9c6ba6dc98050c2..5ab6f8f10210a0e394315e247a2895d4577569f4 100644 (file)
--- a/lib/merge.tcl
+++ b/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"]