diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:21:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:21:18 -0700 |
| commit | 2bf3501150145d1f05678c20ab8e8d66f849851f (patch) | |
| tree | 9b42d85557424e9c0836b4c47ea9d8b86ff2dc1d /rerere.c | |
| parent | Merge branch 'jm/doc-ref-prune' (diff) | |
| parent | test-lib.sh - define and use GREP_STRIPS_CR (diff) | |
| download | tgif-2bf3501150145d1f05678c20ab8e8d66f849851f.tar.xz | |
Merge branch 'ml/avoid-using-grep-on-crlf-files'
On systems that understand a CRLF as a line ending, tests in this
script that worked on files with CRLF line endings using "grep" to
extract matching lines may lose the CR at the end of lines that
match, causing the actual output not to match the expected output.
* ml/avoid-using-grep-on-crlf-files:
test-lib.sh - define and use GREP_STRIPS_CR
Diffstat (limited to 'rerere.c')
0 files changed, 0 insertions, 0 deletions