diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-16 17:41:38 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-16 17:41:38 -0800 |
commit | f124e986cf19e8f36895ae474d50f8d389e73d02 (patch) | |
tree | 4465135bec0bdd6035517bae1be96b8876615436 /unpack-trees.c | |
parent | 413b90f0da613b4edeb6259e04c7dc36b703bc3b (diff) | |
parent | 6675ea4240540e3ee3b0dd2f26b1ad86121d22c6 (diff) | |
download | git-f124e986cf19e8f36895ae474d50f8d389e73d02.tar.gz git-f124e986cf19e8f36895ae474d50f8d389e73d02.tar.xz |
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 'unpack-trees.c')
0 files changed, 0 insertions, 0 deletions