diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2008-02-13 17:27:30 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-02-14 10:49:44 +1100 |
| commit | 6675ea4240540e3ee3b0dd2f26b1ad86121d22c6 (patch) | |
| tree | 309a2feea121f1c87c0e0b0795c49874f6ba7ee7 /git-mergetool.sh | |
| parent | 1407ade93cc1c58d520c2a0f509152ba27b594e8 (diff) | |
| download | git-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 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions