summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgitk4
1 files changed, 2 insertions, 2 deletions
diff --git a/gitk b/gitk
index 1989aa5168..b61e138268 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
}
}