summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-24 19:21:18 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-24 19:21:18 -0700
commit2bf3501150145d1f05678c20ab8e8d66f849851f (patch)
tree9b42d85557424e9c0836b4c47ea9d8b86ff2dc1d /builtin
parent677f32c79f30cafc4a3270118d5cb3736d44be26 (diff)
parent97669eed109f5dea7dffe771d8f6aba4acf84b27 (diff)
downloadgit-2bf3501150145d1f05678c20ab8e8d66f849851f.tar.gz
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 'builtin')
0 files changed, 0 insertions, 0 deletions