diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-26 10:42:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-26 10:42:35 -0700 |
| commit | 42f98745732c68baa6d79a50eab0d726b549025d (patch) | |
| tree | 1faa87249a8800a909bed0d34a22f13207bb3ad5 /git-gui/lib/merge.tcl | |
| parent | Sync with 1.7.4.2 (diff) | |
| parent | Merge branch 'ss/git-gui-mergetool' (diff) | |
| download | tgif-42f98745732c68baa6d79a50eab0d726b549025d.tar.xz | |
Merge git-gui 0.14.0
Diffstat (limited to 'git-gui/lib/merge.tcl')
| -rw-r--r-- | git-gui/lib/merge.tcl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl index 5cded2341c..460d32fa22 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 |