diff --git a/gitk-git/gitk b/gitk-git/gitk
index 25ab725bba48e62f34f8a2fab56eda82fc77be48..f1f21e97bf5e89bd7609cf5b6d1f417e35a43b6c 100644 (file)
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
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)]
}