From: Junio C Hamano Date: Thu, 25 Jul 2013 02:21:18 +0000 (-0700) Subject: Merge branch 'ml/avoid-using-grep-on-crlf-files' X-Git-Tag: v1.8.4-rc0~8 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2bf3501150145d1f05678c20ab8e8d66f849851f 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 --- 2bf3501150145d1f05678c20ab8e8d66f849851f