From e42ba88178c0088cba7cca521a671c92aaa4a300 Mon Sep 17 00:00:00 2001 From: Mark Levedahl Date: Tue, 13 Feb 2024 00:13:10 -0500 Subject: [PATCH] git-gui: git merge understands --strategy=recursive git-gui's merge driver includes code to invoke the recursive strategy for merging prior to git v2.5 that added a simpler syntax. As git-gui requires git v2.36 or later, let's delete the code targeting earlier git. Signed-off-by: Mark Levedahl --- lib/merge.tcl | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/merge.tcl b/lib/merge.tcl index 44c3f93584..375fa19a12 100644 --- a/lib/merge.tcl +++ b/lib/merge.tcl @@ -112,16 +112,7 @@ method _start {} { close $fh set _last_merged_branch $branch - 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_redir [list fmt-merge-msg] [list <[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"] -- 2.47.2