Merge branch 'js/diffstat' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 13 Apr 2006 23:50:48 +0000 (16:50 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 13 Apr 2006 23:50:48 +0000 (16:50 -0700)
* js/diffstat:
  diff-options: add --stat (take 2)
  diff-options: add --stat (take 2)


Trivial merge