From: Junio C Hamano <junkio@cox.net>
Date: Tue, 2 May 2006 06:09:15 +0000 (-0700)
Subject: Merge branch 'jc/diff' into next
X-Git-Tag: v1.4.1-rc1~154
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/200f5dffc257f99f99597d1a8127e1d79ff3c176?hp=200f5dffc257f99f99597d1a8127e1d79ff3c176

Merge branch 'jc/diff' into next

* jc/diff:
builtin-diff: call it "git-diff", really.
---