diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-17 01:41:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-17 01:41:38 (GMT) |
| commit | f124e986cf19e8f36895ae474d50f8d389e73d02 (patch) | |
| tree | 4465135bec0bdd6035517bae1be96b8876615436 /gitk-git/gitk | |
| parent | 413b90f0da613b4edeb6259e04c7dc36b703bc3b (diff) | |
| parent | 6675ea4240540e3ee3b0dd2f26b1ad86121d22c6 (diff) | |
| download | git-f124e986cf19e8f36895ae474d50f8d389e73d02.zip git-f124e986cf19e8f36895ae474d50f8d389e73d02.tar.gz git-f124e986cf19e8f36895ae474d50f8d389e73d02.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk:
[PATCH] gitk: Heed the lines of context in merge commits
Diffstat (limited to 'gitk-git/gitk')
| -rw-r--r-- | gitk-git/gitk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gitk-git/gitk b/gitk-git/gitk index 25ab725..f1f21e9 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)] } |