merge-recursive: handle D/F conflict case more carefully.

diff --git a/gitk b/gitk
index 9ddff3e7f7b011564c56fb619f57bed66d875f7e..db28d745dc005722ff3d7c071aeb37f9fd4fdc21 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -720,6 +720,7 @@ proc makewindow {} {
     bindkey <Key-Return> {findnext 0}
     bindkey ? findprev
     bindkey f nextfile
+    bindkey <F5> updatecommits
     bind . <Control-q> doquit
     bind . <Control-f> dofind
     bind . <Control-g> {findnext 0}
@@ -985,6 +986,7 @@ f           Scroll diff view to next file
 <Ctrl-plus>    Increase font size
 <Ctrl-KP->     Decrease font size
 <Ctrl-minus>   Decrease font size
+<F5>           Update
 } \
            -justify left -bg white -border 2 -relief sunken
     pack $w.m -side top -fill both
@@ -1904,7 +1906,7 @@ proc do_file_hl {serial} {
     } else {
        set gdtargs [list "-S$highlight_files"]
     }
-    set cmd [concat | git-diff-tree -r -s --stdin $gdtargs]
+    set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
     set filehighlight [open $cmd r+]
     fconfigure $filehighlight -blocking 0
     fileevent $filehighlight readable readfhighlight
@@ -1956,7 +1958,7 @@ proc readfhighlight {} {
     }
     if {[eof $filehighlight]} {
        # strange...
-       puts "oops, git-diff-tree died"
+       puts "oops, git diff-tree died"
        catch {close $filehighlight}
        unset filehighlight
     }