Skip to content

Commit

Permalink
[PATCH] gitk: Heed the lines of context in merge commits
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Sixt authored and Paul Mackerras committed Feb 13, 2008
1 parent 1407ade commit 6675ea4
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion gitk
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
}
Expand Down

0 comments on commit 6675ea4

Please sign in to comment.