From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 1 Nov 2011 23:10:56 +0000 (-0700)
Subject: Merge branch 'jc/maint-diffstat-numstat-context' into maint
X-Git-Tag: v1.7.7.2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eee947fb95dfa160d924824518dbfcb350c10aa5

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

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

eee947fb95dfa160d924824518dbfcb350c10aa5