Merge branch 'jc/diff' into next
authorJunio C Hamano <junkio@cox.net>
Sun, 5 Mar 2006 00:21:38 +0000 (16:21 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 5 Mar 2006 00:21:38 +0000 (16:21 -0800)
* jc/diff:
  Merge jc/diff leftover bits.


Trivial merge