Merge branch 'jc/maint-diffstat-numstat-context' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 23:10:56 +0000 (16:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 23:10:56 +0000 (16:10 -0700)
commiteee947fb95dfa160d924824518dbfcb350c10aa5
tree02453e85c4c78cb4fb2a35557c86ac47dafdb468
parentdddc411f7abbd82f6fa7d323711b8a7b94a1abc2
parentf01cae918feb564da8c7a286b32c7c917599acdd
Merge branch 'jc/maint-diffstat-numstat-context' into maint

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