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)
commitbff898b894815ad291b35d213f1c022d1d16a9b9
tree7ea885764fff179b622ddeb38ea97304bebeb971
parent604d7a1ac0405c2ce048a1113e60d9d0c0d3e3d9
parenta8d610a2a39496a83108d95e7899e6b373e80940
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