Merge git-gui 0.14.0

2011-03-26 10:42:26 -07:00
parent 421446b6fc fbc9629e2f
commit 42f9874573
14 changed files with 3383 additions and 449 deletions
--- 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