gitk: Show diffs for boundary commits

diff --git a/gitk b/gitk
index 1989aa5168a72cca924cf91836f24ee7212fd21f..b61e138268f380630fce3fb9cbd4ed667567ac7d 100755 (executable)
--- 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
     }
 }