X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gitk-git%2Fgitk;fp=gitk-git%2Fgitk;h=f1f21e97bf5e89bd7609cf5b6d1f417e35a43b6c;hb=f124e986cf19e8f36895ae474d50f8d389e73d02;hp=25ab725bba48e62f34f8a2fab56eda82fc77be48;hpb=413b90f0da613b4edeb6259e04c7dc36b703bc3b;p=git.git

diff --git a/gitk-git/gitk b/gitk-git/gitk
index 25ab725bb..f1f21e97b 100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -5032,13 +5032,14 @@ proc getblobline {bf id} {
 proc mergediff {id l} {
     global diffmergeid mdifffd
     global diffids
+    global diffcontext
     global parentlist
     global limitdiffs viewfiles curview
 
     set diffmergeid $id
     set diffids $id
     # this doesn't seem to actually affect anything...
-    set cmd [concat | git diff-tree --no-commit-id --cc $id]
+    set cmd [concat | git diff-tree --no-commit-id --cc -U$diffcontext $id]
     if {$limitdiffs && $viewfiles($curview) ne {}} {
 	set cmd [concat $cmd -- $viewfiles($curview)]
     }