tree 4c17578024416e93f4d429608d7522c1b226778c
parent 034a8a0df392fa809a506d0da65b9245db939d8f
parent f01cae918feb564da8c7a286b32c7c917599acdd
author Junio C Hamano <gitster@pobox.com> 1318287378 -0700
committer Junio C Hamano <gitster@pobox.com> 1318287378 -0700

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

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