From: Junio C Hamano <junkio@cox.net>
Date: Sat, 4 Mar 2006 23:49:26 +0000 (-0800)
Subject: Merge jc/diff leftover bits.
X-Git-Tag: v1.3.0-rc1~49^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ce2a34188b70c2d04ffdc1d9d3acc04d7a35c5c6?ds=inline;hp=--cc

Merge jc/diff leftover bits.
---

ce2a34188b70c2d04ffdc1d9d3acc04d7a35c5c6