Merge git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2008 01:41:38 +0000 (17:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2008 01:41:38 +0000 (17:41 -0800)
commitf124e986cf19e8f36895ae474d50f8d389e73d02
tree4465135bec0bdd6035517bae1be96b8876615436
parent413b90f0da613b4edeb6259e04c7dc36b703bc3b
parent6675ea4240540e3ee3b0dd2f26b1ad86121d22c6
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
gitk-git/gitk