| commit | fa04ae0be8cca1291a60bc8a393f9c52d2582089 | |
| author | Antoine Pelisse <apelisse@gmail.com> | |
| Thu, 14 Mar 2013 21:03:14 +0000 (14 22:03 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 14 Mar 2013 21:43:34 +0000 (14 14:43 -0700) | ||
| tree | 425ab927b9cab74bf40cbde081a9141742318dc9 | treesnapshot (tar.gz zip) |
| parent | 239222f587ed06f96d90dd71c66d80a2b1e3dc9f | commitdiff |
Allow combined diff to ignore white-spaces
The combined diff --cc output does not honor options to ignore
whitespace changes (-b, -w, and --ignore-space-at-eol).
Correct this by passing diff flags to diff engine, so that combined
diff behaves as normal diff does with spaces, and by coalescing
lines that are removed from both (or more) parents, honoring the
same rule to ignore whitespace changes.
With this change, a conflict-less merge done using a ignore-*
strategy option will not show any conflict if shown in combined-diff
using the same option.
Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The combined diff --cc output does not honor options to ignore
whitespace changes (-b, -w, and --ignore-space-at-eol).
Correct this by passing diff flags to diff engine, so that combined
diff behaves as normal diff does with spaces, and by coalescing
lines that are removed from both (or more) parents, honoring the
same rule to ignore whitespace changes.
With this change, a conflict-less merge done using a ignore-*
strategy option will not show any conflict if shown in combined-diff
using the same option.
Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| combine-diff.c | diffblobblamehistory | |
| t/t4038-diff-combined.sh | diffblobblamehistory |