Merge branch 'master' of git://repo.or.cz/git-gui

[git.git] / git-gui / lib / merge.tcl

diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index 3dce856e5ef29663f10fec818a2b25a9737060c0..24ed24b3d091230d186208bd3656867f3fea70a0 100644 (file)
--- a/git-gui/lib/merge.tcl
+++ b/git-gui/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
 }
@@ -238,6 +239,8 @@ proc dialog {} {
                        $subj([lindex $ref 0])]
        }
 
+       bind $w.source.l <Key-K> [list event generate %W <Shift-Key-Up>]
+       bind $w.source.l <Key-J> [list event generate %W <Shift-Key-Down>]
        bind $w.source.l <Key-k> [list event generate %W <Key-Up>]
        bind $w.source.l <Key-j> [list event generate %W <Key-Down>]
        bind $w.source.l <Key-h> [list event generate %W <Key-Left>]