From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Mar 2013 16:28:50 +0000 (-0700)
Subject: Merge branch 'ap/combine-diff-ignore-whitespace'
X-Git-Tag: v1.8.3-rc0~165
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f301f70094470298cdb39d3a4d6d903326a1fdc;p=git

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

Teach "diff --cc" output to honor options to ignore various forms
of whitespace changes.

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

4f301f70094470298cdb39d3a4d6d903326a1fdc