From: Junio C Hamano <junkio@cox.net>
Date: Wed, 1 Mar 2006 09:36:29 +0000 (-0800)
Subject: Merge part of 'jc/diff' into next
X-Git-Tag: v1.3.0-rc1~54^2~17
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=213523f46c51c5e5f1b2623dcb3af822add75caa;p=git.git

Merge part of 'jc/diff' into next
---

213523f46c51c5e5f1b2623dcb3af822add75caa