From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Mar 2009 06:20:52 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.6.2~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f8c62880ef22b74ea6df47bb349ff0743d2a93f9;p=git.git

Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix possible infinite loop and display corruption
---

f8c62880ef22b74ea6df47bb349ff0743d2a93f9
diff --cc gitk-git/gitk
index dc2a43961,1773ae63e..1773ae63e
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk