| commit | dfb2c989619cace8a5bba3af9b148bd048a479d1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Mar 2013 22:57:22 +0000 (19 15:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Mar 2013 22:57:22 +0000 (19 15:57 -0700) | ||
| tree | 518515ce771bde9547a248c1bc82ff4c3151c43b | treesnapshot (tar.gz zip) |
| parent | e68014a8e82477762b2c59fcdb81747fea4afd57 | commitdiff |
| parent | fa04ae0be8cca1291a60bc8a393f9c52d2582089 | commitdiff |
Merge branch 'ap/combine-diff-ignore-whitespace' into next
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