diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-05-09 00:33:47 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-05-09 01:38:54 (GMT) |
| commit | c74b6c66f00ce51b2c01d20fc5ef0e6429811124 (patch) | |
| tree | 354c54001cae46387de2230af368b33c1b4b5154 /lib/merge.tcl | |
| parent | 1f07c4e5cefec88d825045ade24eee71f6a2df47 (diff) | |
| download | git-c74b6c66f00ce51b2c01d20fc5ef0e6429811124.zip git-c74b6c66f00ce51b2c01d20fc5ef0e6429811124.tar.gz git-c74b6c66f00ce51b2c01d20fc5ef0e6429811124.tar.bz2 | |
git-gui: Convert browser, console to "class" format
Now that we have a slightly easier method of working with per-widget
data we should make use of that technique in our browser and console
meta-widgets, as both have a decent amount of information that they
store on a per-widget basis and our current approach of handling
it is difficult to follow.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib/merge.tcl')
| -rw-r--r-- | lib/merge.tcl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/merge.tcl b/lib/merge.tcl index 642d6ee..24ed24b 100644 --- a/lib/merge.tcl +++ b/lib/merge.tcl @@ -123,7 +123,8 @@ Please select fewer branches. To merge more than 15 branches, merge the branche set msg "Merging $current_branch, [join $names {, }]" set ui_status_value "$msg..." set cons [console::new "Merge" $msg] - console::exec $cons $cmd [namespace code [list _finish $revcnt]] + console::exec $cons $cmd \ + [namespace code [list _finish $revcnt $cons]] bind $w <Destroy> {} destroy $w } |