X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-gui%2Flib%2Fmerge.tcl;h=460d32fa22fc77f6621e5ec9a9c6ba6dc98050c2;hb=96220d837c4f58a6be447127b727b8a55246d231;hp=5cded2341c541b5688adbac35d3d2e1216bc2d0b;hpb=4e7d08a229a531f8d7841a8a1a892d5989130d67;p=git.git

diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index 5cded2341..460d32fa2 100644
--- 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