From 7b5ff7e7d715391b9745a46fcfaacf1d97d4dc9f Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Thu, 30 Mar 2006 20:50:40 +1100 Subject: [PATCH] gitk: Show diffs for boundary commits With this we run git-diff-tree on a commit even if we think it has no parents, either because it really has no parents or because it is a boundary commit. This means that gitk shows the diff for a boundary commit when it is selected. Signed-off-by: Paul Mackerras --- gitk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 } } -- 2.11.0