projects / gitk / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1407ade) | patch
[PATCH] gitk: Heed the lines of context in merge commits
authorJohannes Sixt <johannes.sixt@telecom.at>
Wed, 13 Feb 2008 16:27:30 +0000 (17:27 +0100)
committerPaul Mackerras <paulus@samba.org>
Wed, 13 Feb 2008 23:49:44 +0000 (10:49 +1100)
commit6675ea4240540e3ee3b0dd2f26b1ad86121d22c6
tree309a2feea121f1c87c0e0b0795c49874f6ba7ee7tree | snapshot
parent1407ade93cc1c58d520c2a0f509152ba27b594e8commit | diff
[PATCH] gitk: Heed the lines of context in merge commits

There is an edit box where the number of context lines can be chosen.
But it was only used when regular diffs were displayed, not for
merge commits.   This fixes it.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Paul Mackerras <paulus@samba.org>
gitk diff | blob | history
Gitk: Windows and themed Tk support