From: Junio C Hamano <junkio@cox.net>
Date: Mon, 7 May 2007 21:40:41 +0000 (-0700)
Subject: Merge git://git2.kernel.org/pub/scm/gitk/gitk into maint
X-Git-Tag: v1.5.1.4~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bff898b894815ad291b35d213f1c022d1d16a9b9;p=git.git

Merge git://git2./pub/scm/gitk/gitk into maint

* git://git2.kernel.org/pub/scm/gitk/gitk:
  gitk: Allow user to choose whether to see the diff, old file, or new file
---

bff898b894815ad291b35d213f1c022d1d16a9b9