mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-18 21:19:13 +02:00
Code

Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax 

* 'rs/use-modern-git-merge-syntax' of git-gui:
  git-gui: stop using deprecated merge syntax
This commit is contained in:
Junio C Hamano 2016-09-26 07:16:29 -07:00
parent 0b65a8dbdb b5f325cb4a
commit ff65e796f0
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,12 +112,7 @@ method _start {} {
close $fh
set _last_merged_branch $branch
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
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"]