Merge jc/diff leftover bits.
authorJunio C Hamano <junkio@cox.net>
Sat, 4 Mar 2006 23:49:26 +0000 (15:49 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 4 Mar 2006 23:49:26 +0000 (15:49 -0800)

Trivial merge