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

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

Junio C Hamano committed Nov 1, 2011 at 16:10 UTC eee947fb95dfa160d924824518dbfcb350c10aa5

No changes.