aboutsummaryrefslogtreecommitdiff
path: root/gitk-git
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2008-02-13 17:27:30 +0100
committerPaul Mackerras <paulus@samba.org>2008-02-14 10:49:44 +1100
commit6675ea4240540e3ee3b0dd2f26b1ad86121d22c6 (patch)
tree309a2feea121f1c87c0e0b0795c49874f6ba7ee7 /gitk-git
parent1407ade93cc1c58d520c2a0f509152ba27b594e8 (diff)
downloadgit-6675ea4240540e3ee3b0dd2f26b1ad86121d22c6.tar.gz
git-6675ea4240540e3ee3b0dd2f26b1ad86121d22c6.tar.xz
[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>
Diffstat (limited to 'gitk-git')
0 files changed, 0 insertions, 0 deletions