From: Junio C Hamano <junkio@cox.net>
Date: Wed, 17 Aug 2005 05:30:46 +0000 (-0700)
Subject: Merge with master to get diff fixes.
X-Git-Tag: v0.99.5~17
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6680153441de6fbba07868d5f54af74d31a3ff13;p=git.git

Merge with master to get diff fixes.
---

6680153441de6fbba07868d5f54af74d31a3ff13