mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-09 05:36:10 +02:00
Code

Merge babbb4d4cd into e326e52010

This commit is contained in:
Elijah Newren 2024-04-25 23:08:24 +00:00 committed by GitHub
parent e326e52010 babbb4d4cd
commit b87c692e99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-gui/lib/merge.tcl
View File

@ -112,7 +112,9 @@ method _start {} {
close $fh
set _last_merged_branch $branch
if {[git-version >= "2.5.0"]} {
if {[git-version >= "2.34.0"]} {
set cmd [list git merge --strategy=ort FETCH_HEAD]
} elseif {[git-version >= "2.5.0"]} {
set cmd [list git merge --strategy=recursive FETCH_HEAD]
} else {
set cmd [list git]