Merge branch 'jc/maint-diffstat-numstat-context'

* jc/maint-diffstat-numstat-context: diff: teach --stat/--numstat to honor -U$num

Junio C Hamano committed Oct 10, 2011 at 15:56 UTC 7ddd582402aa926d5ec33d914ccc8bfaf1b15c06

No changes.