Merge branch 'jk/maint-gitweb-test-use-sane-perl' into maint

diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index 5cded2341c541b5688adbac35d3d2e1216bc2d0b..460d32fa22fc77f6621e5ec9a9c6ba6dc98050c2 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
+       global _last_merged_branch
 
        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
+       set _last_merged_branch $branch
 
        set cmd [list git]
        lappend cmd merge