diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-07-25 01:29:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-25 01:29:20 -0700 |
| commit | 422a82f21370fe38b3e926a83b460bf2b1dd13ab (patch) | |
| tree | 744e121cdc79db2c8243555929e240aa170a187c /builtin-merge-recursive.c | |
| parent | SunOS grep does not understand -C<n> nor -e (diff) | |
| download | tgif-422a82f21370fe38b3e926a83b460bf2b1dd13ab.tar.xz | |
Fix severe breakage in "git-apply --whitespace=fix"
735c674 (Trailing whitespace and no newline fix, 2009-07-22) completely
broke --whitespace=fix, causing it to lose all the empty lines in a patch.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions