Merge branch 'jc/maint-diffstat-numstat-context'
commit7ddd582402aa926d5ec33d914ccc8bfaf1b15c06
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2011 22:56:18 +0000 (10 15:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2011 22:56:18 +0000 (10 15:56 -0700)
tree4c17578024416e93f4d429608d7522c1b226778c
parent034a8a0df392fa809a506d0da65b9245db939d8f
parentf01cae918feb564da8c7a286b32c7c917599acdd
Merge branch 'jc/maint-diffstat-numstat-context'

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