summaryrefslogtreecommitdiff
path: root/lib/merge.tcl
diff options
context:
space:
mode:
Diffstat (limited to 'lib/merge.tcl')
-rw-r--r--lib/merge.tcl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/merge.tcl b/lib/merge.tcl
index 642d6eefbd..24ed24b3d0 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
}