From: Junio C Hamano <junkio@cox.net>
Date: Sun, 5 Mar 2006 00:21:38 +0000 (-0800)
Subject: Merge branch 'jc/diff' into next
X-Git-Tag: v1.3.0-rc1~49
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a5abcd094b8592209aa70fa9b3e149f2f9be6eea?hp=--cc

Merge branch 'jc/diff' into next

* jc/diff:
Merge jc/diff leftover bits.
---

a5abcd094b8592209aa70fa9b3e149f2f9be6eea