Merge git-gui 0.14.0

[git/git.git] / git-gui / lib / merge.tcl

diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index 5cded23..460d32f 100644 (file)
--- a/git-gui/lib/merge.tcl
+++ b/git-gui/lib/merge.tcl
@@ -83,6 +83,7 @@ method _visualize {} {
 
 method _start {} {
        global HEAD current_branch remote_url
 
 method _start {} {
        global HEAD current_branch remote_url

+       global _last_merged_branch

 
        set name [_rev $this]
        if {$name eq {}} {
 
        set name [_rev $this]
        if {$name eq {}} {


@@ -109,6 +110,7 @@ method _start {} {
        regsub ^refs/heads/ $branch {} branch
        puts $fh "$cmit\t\tbranch '$branch' of $remote"
        close $fh
        regsub ^refs/heads/ $branch {} branch
        puts $fh "$cmit\t\tbranch '$branch' of $remote"
        close $fh

+       set _last_merged_branch $branch

 
        set cmd [list git]
        lappend cmd merge
 
        set cmd [list git]
        lappend cmd merge