| commit | 4f301f70094470298cdb39d3a4d6d903326a1fdc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Mar 2013 16:28:50 +0000 (27 09:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Mar 2013 16:28:50 +0000 (27 09:28 -0700) | ||
| tree | c78151dc9343adf8836ede7a69f686a1bca112b1 | treesnapshot (tar.gz zip) |
| parent | 2bba2f0e6542d541e9f27653d8c9d5fc8d0e679c | commitdiff |
| parent | fa04ae0be8cca1291a60bc8a393f9c52d2582089 | commitdiff |
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
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