From: Junio C Hamano <junkio@cox.net>
Date: Thu, 18 Aug 2005 19:25:18 +0000 (-0700)
Subject: Merge with master to pick up gitk --parents changes.
X-Git-Tag: v0.99.5~13
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=920b9d9256372d3061584c270795868a4c29d1b4;p=git.git

Merge ... master to pick up gitk --parents changes.
---

920b9d9256372d3061584c270795868a4c29d1b4