From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Apr 2013 18:26:56 +0000 (-0700)
Subject: Merge branch 'ap/combine-diff-ignore-whitespace' into maint
X-Git-Tag: v1.8.2.2~29
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2c697a67b14d432b844e996243633711ef5f4b32?ds=inline;hp=--cc

Merge branch 'ap/combine-diff-ignore-whitespace' into maint

* ap/combine-diff-ignore-whitespace:
Allow combined diff to ignore white-spaces
---

2c697a67b14d432b844e996243633711ef5f4b32