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)
* ap/combine-diff-ignore-whitespace:
Allow combined diff to ignore white-spaces

Trivial merge