From: Junio C Hamano 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.tokkee.org/?a=commitdiff_plain;h=eee947fb95dfa160d924824518dbfcb350c10aa5;p=git.git Merge branch 'jc/maint-diffstat-numstat-context' into maint * jc/maint-diffstat-numstat-context: diff: teach --stat/--numstat to honor -U$num --- eee947fb95dfa160d924824518dbfcb350c10aa5