summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-26 14:16:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-26 14:16:48 (GMT)
commitff65e796f00097c118a85ac40e51405080e98627 (patch)
tree6d40a7e6c47c860a1f56b1691d89894f03f5745a /git-gui
parent0b65a8dbdb38962e700ee16776a3042beb489060 (diff)
parentb5f325cb4a0d986689177857a62007027a532d31 (diff)
downloadgit-ff65e796f00097c118a85ac40e51405080e98627.zip
git-ff65e796f00097c118a85ac40e51405080e98627.tar.gz
git-ff65e796f00097c118a85ac40e51405080e98627.tar.bz2
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
Diffstat (limited to 'git-gui')
-rw-r--r--git-gui/lib/merge.tcl7
1 files changed, 1 insertions, 6 deletions
diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index 460d32f..5ab6f8f 100644
--- a/git-gui/lib/merge.tcl
+++ b/git-gui/lib/merge.tcl
@@ -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"]