Merge branch 'jc/diff' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 20 Apr 2006 06:22:40 +0000 (23:22 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 20 Apr 2006 06:22:40 +0000 (23:22 -0700)
* jc/diff:
  diff --stat: do not drop rename information.


Trivial merge