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

git-gui: fix default merge strategy 

Signed-off-by: Elijah Newren <newren@gmail.com>
This commit is contained in:
Elijah Newren 2021-07-22 13:08:02 -07:00
parent 1ffcbaa1a5
commit babbb4d4cd
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]