From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 Feb 2008 01:41:38 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.5.5-rc0~213
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f124e986cf19e8f36895ae474d50f8d389e73d02;p=git.git

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
---

f124e986cf19e8f36895ae474d50f8d389e73d02
diff --cc gitk-git/gitk
index 25ab725bb,f1f21e97b..f1f21e97b
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk