X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=gitk;h=b61e138268f380630fce3fb9cbd4ed667567ac7d;hb=7b5ff7e7d715391b9745a46fcfaacf1d97d4dc9f;hp=1989aa5168a72cca924cf91836f24ee7212fd21f;hpb=16c1ff968ac9717c958129eb05aa089cc0ca51e7;p=git.git

diff --git a/gitk b/gitk
index 1989aa51..b61e1382 100755
--- a/gitk
+++ b/gitk
@@ -2386,9 +2386,9 @@ proc selectline {l isnew} {
 
     $cflist delete 0 end
     $cflist insert end "Comments"
-    if {$nparents($id) == 1} {
+    if {$nparents($id) <= 1} {
 	startdiff $id
-    } elseif {$nparents($id) > 1} {
+    } else {
 	mergediff $id
     }
 }