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

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

Junio C Hamano committed Apr 22, 2013 at 11:26 UTC 2c697a67b14d432b844e996243633711ef5f4b32

No changes.