summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gitk-git/gitk3
1 files changed, 2 insertions, 1 deletions
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 25ab725bba..f1f21e97bf 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)]
}