projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gitk: Show diffs for boundary commits
[git.git]
/
gitk
diff --git
a/gitk
b/gitk
index
1989aa5
..
b61e138
100755
(executable)
--- a/
gitk
+++ b/
gitk
@@
-2386,9
+2386,9
@@
proc selectline {l isnew} {
$cflist delete 0 end
$cflist insert end "Comments"
$cflist delete 0 end
$cflist insert end "Comments"
- if {$nparents($id)
=
= 1} {
+ if {$nparents($id)
<
= 1} {
startdiff $id
startdiff $id
- } else
if {$nparents($id) > 1}
{
+ } else {
mergediff $id
}
}
mergediff $id
}
}