Merge part of 'jc/diff'
authorJunio C Hamano <redacted>
Thu, 2 Mar 2006 06:15:38 +0000 (22:15 -0800)
committerJunio C Hamano <redacted>
Thu, 2 Mar 2006 06:15:38 +0000 (22:15 -0800)

Trivial merge
git clone https://git.99rst.org/PROJECT