From: Junio C Hamano <junkio@cox.net>
Date: Thu, 2 Mar 2006 06:15:38 +0000 (-0800)
Subject: Merge part of 'jc/diff'
X-Git-Tag: v1.3.0-rc1~98
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=379156e1dc46e0d22f0c7c0c52913c6259c62258

Merge part of 'jc/diff'
---

379156e1dc46e0d22f0c7c0c52913c6259c62258