[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>
Johannes Sixt committed
Feb 13, 2008 at 17:27 UTC
6675ea4240540e3ee3b0dd2f26b1ad86121d22c6
1 file changed
+2
-1
gitk
+2
-1
@@ -5032,13 +5032,14 @@ proc getblobline {bf id} {
5032
proc mergediff {id l} {
5033
global diffmergeid mdifffd
5034
global diffids
5035
+ global diffcontext
5036
global parentlist
5037
global limitdiffs viewfiles curview
5038
5039
set diffmergeid $id
5040
set diffids $id
5041
# this doesn't seem to actually affect anything...
5041
- set cmd [concat | git diff-tree --no-commit-id --cc $id]
5042
+ set cmd [concat | git diff-tree --no-commit-id --cc -U$diffcontext $id]
5043
if {$limitdiffs && $viewfiles($curview) ne {}} {
5044
set cmd [concat $cmd -- $viewfiles($curview)]
5045
}