Merge tag 'v2.10.4' into maint-2.11

diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index 5ab6f8f10210a0e394315e247a2895d4577569f4..9f253db5b37e5633c19914248a58a3f2feb3c512 100644 (file)
--- a/git-gui/lib/merge.tcl
+++ b/git-gui/lib/merge.tcl
@@ -112,7 +112,16 @@ method _start {} {
        close $fh
        set _last_merged_branch $branch
 
-       set cmd [list git merge --strategy=recursive FETCH_HEAD]
+       if {[git-version >= "2.5.0"]} {
+               set cmd [list git merge --strategy=recursive FETCH_HEAD]
+       } else {
+               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
+       }
 
        ui_status [mc "Merging %s and %s..." $current_branch $stitle]
        set cons [console::new [mc "Merge"] "merge $stitle"]
@@ -144,7 +153,7 @@ constructor dialog {} {
        }
 
        make_dialog top w
-       wm title $top [append "[appname] ([reponame]): " [mc "Merge"]]
+       wm title $top [mc "%s (%s): Merge" [appname] [reponame]]
        if {$top ne {.}} {
                wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
        }