Merge with gitk.
authorJunio C Hamano <junkio@cox.net>
Fri, 29 Jul 2005 17:17:37 +0000 (10:17 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 29 Jul 2005 17:17:37 +0000 (10:17 -0700)

Trivial merge