From: Johannes Sixt <johannes.sixt@telecom.at>
Date: Wed, 13 Feb 2008 16:27:30 +0000 (+0100)
Subject: [PATCH] gitk: Heed the lines of context in merge commits
X-Git-Tag: v1.5.5-rc0~13^2~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6675ea4240540e3ee3b0dd2f26b1ad86121d22c6;p=git.git

[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>
---

diff --git a/gitk b/gitk
index 25ab725bb..f1f21e97b 100755
--- a/gitk
+++ b/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)]
     }