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)
commit920b9d9256372d3061584c270795868a4c29d1b4
treedc620bd21ec26dae4c88a9fb622aff3b5f390672
parent0776f4cb3471bef7f156d9e615d6911747b3eba3
parent9d34c29db39bdb5c2443475dd6a24cfc5c2c9e37
Merge ... master to pick up gitk --parents changes.