diff --git a/gitk b/gitk index 1989aa516..b61e13826 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 } }