Merge branch 'ap/combine-diff-ignore-whitespace' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:56 +0000 (11:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:56 +0000 (11:26 -0700)
commit2c697a67b14d432b844e996243633711ef5f4b32
treea973a7df63f238cd7a6849dd9d29031a0a83fa9d
parent4aaafdc6f14b3ae79cd35158767d842b62eaad08
parentfa04ae0be8cca1291a60bc8a393f9c52d2582089
Merge branch 'ap/combine-diff-ignore-whitespace' into maint

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