Build-in merge-recursive

diff --git a/gitk-git/gitk b/gitk-git/gitk
index 801a5a9d86d78b77811ef27b23cb37926c69f463..5560e4dc560587c4a551c24a1ee59df394726fc9 100644 (file)
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -996,6 +996,7 @@ proc makewindow {} {
     bind . <$M1B-r> dosearchback
     bind . <$M1B-s> dosearch
     bind . <$M1B-equal> {incrfont 1}
+    bind . <$M1B-plus> {incrfont 1}
     bind . <$M1B-KP_Add> {incrfont 1}
     bind . <$M1B-minus> {incrfont -1}
     bind . <$M1B-KP_Subtract> {incrfont -1}
@@ -2629,12 +2630,12 @@ proc askrelhighlight {row id} {
 
     if {![info exists selectedline]} return
     set isbold 0
-    if {$highlight_related eq [mc "Descendent"] ||
-       $highlight_related eq [mc "Not descendent"]} {
+    if {$highlight_related eq [mc "Descendant"] ||
+       $highlight_related eq [mc "Not descendant"]} {
        if {![info exists descendent($id)]} {
            is_descendent $id
        }
-       if {$descendent($id) == ($highlight_related eq [mc "Descendent"])} {
+       if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} {
            set isbold 1
        }
     } elseif {$highlight_related eq [mc "Ancestor"] ||