Merge with master to pick up gitk --parents changes.
authorJunio C Hamano <junkio@cox.net>
Thu, 18 Aug 2005 19:25:18 +0000 (12:25 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 18 Aug 2005 19:25:18 +0000 (12:25 -0700)
Trivial merge