From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Oct 2011 22:56:18 +0000 (-0700)
Subject: Merge branch 'jc/maint-diffstat-numstat-context'
X-Git-Tag: v1.7.8-rc0~110
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7ddd582402aa926d5ec33d914ccc8bfaf1b15c06

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

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

7ddd582402aa926d5ec33d914ccc8bfaf1b15c06