Merge git://git2.kernel.org/pub/scm/gitk/gitk into maint
authorJunio C Hamano <junkio@cox.net>
Mon, 7 May 2007 21:40:41 +0000 (14:40 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 7 May 2007 21:40:41 +0000 (14:40 -0700)
* git://git2.kernel.org/pub/scm/gitk/gitk:
  gitk: Allow user to choose whether to see the diff, old file, or new file


Trivial merge