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)
commitc95fa67fd8dc8b5448e1dd33ed25a6dcea97ee49
tree754ed85671a3ea0f1b8ee95be154eef2ca61a929
parent55436162c72c07b51d4a2008ed1177733fbf0a95
parent44aad15f0d03860884bbe1cc95ff6dfc4badf505
Merge branch 'jc/diff' into next

* jc/diff:
  diff --stat: do not drop rename information.