diff options
| author |  Pat Thoyts <patthoyts@users.sourceforge.net> | 2016-10-03 23:23:19 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2016-10-03 23:23:19 +0100 |
| commit | 9613644a310980beaaafc84f20e55520818b89b0 (patch) | |
| tree | a220faf9b38aa54b55702d5002a91345b7566dd7 /lib | |
| parent | Merge branch 'js/commit-gpgsign' into pu (diff) | |
| parent | git-gui: stop using deprecated merge syntax (diff) | |
| download | tgif-9613644a310980beaaafc84f20e55520818b89b0.tar.xz | |
Merge branch 'rs/use-modern-git-merge-syntax' into pu
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/merge.tcl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/merge.tcl b/lib/merge.tcl index 460d32fa22..5ab6f8f102 100644 --- a/lib/merge.tcl +++ b/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"] |