mirror of
https://github.com/git/git.git
synced 2024-05-20 05:16:09 +02:00
Merge babbb4d4cd
into e326e52010
This commit is contained in:
commit
b87c692e99
|
@ -112,7 +112,9 @@ method _start {} {
|
||||||
close $fh
|
close $fh
|
||||||
set _last_merged_branch $branch
|
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]
|
set cmd [list git merge --strategy=recursive FETCH_HEAD]
|
||||||
} else {
|
} else {
|
||||||
set cmd [list git]
|
set cmd [list git]
|
||||||
|
|
Loading…
Reference in New Issue