Merge branch 'jc/diff-numstat'
commitf73a5e897609c895aa6c10f7a89428d1749d37ce
authorJunio C Hamano <junkio@cox.net>
Thu, 19 Oct 2006 05:08:42 +0000 (18 22:08 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 19 Oct 2006 05:08:42 +0000 (18 22:08 -0700)
tree14d34586f6d57e47b60be3145ab3754d1ac94fdd
parent8719f93b5619a0df99cec6e919a260f01ab76184
parent74e2abe5b70aadf06984472ba9aa9a29900040e6
Merge branch 'jc/diff-numstat'

* jc/diff-numstat:
  diff --numstat