![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Feb 2008 01:41:38 +0000 (17:41 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Feb 2008 01:41:38 +0000 (17:41 -0800) | ||
| commit | f124e986cf19e8f36895ae474d50f8d389e73d02 | |
| tree | 4465135bec0bdd6035517bae1be96b8876615436 | tree | snapshot |
| parent | 413b90f0da613b4edeb6259e04c7dc36b703bc3b | commit | diff |
| parent | 6675ea4240540e3ee3b0dd2f26b1ad86121d22c6 | commit | diff |
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
* git://git.kernel.org/pub/scm/gitk/gitk:
[PATCH] gitk: Heed the lines of context in merge commits
| gitk-git/gitk | diff1 | | | | blob | history |