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 /t/t3032-merge-recursive-options.sh | |
| parent | 677f32c79f30cafc4a3270118d5cb3736d44be26 (diff) | |
| parent | 97669eed109f5dea7dffe771d8f6aba4acf84b27 (diff) | |
| download | git-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 't/t3032-merge-recursive-options.sh')
| -rwxr-xr-x | t/t3032-merge-recursive-options.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh index 2b17311cb0..5fd7bbb652 100755 --- a/t/t3032-merge-recursive-options.sh +++ b/t/t3032-merge-recursive-options.sh @@ -14,7 +14,7 @@ test_description='merge-recursive options . ./test-lib.sh test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b -test_have_prereq MINGW && export GREP_OPTIONS=-U +test_have_prereq GREP_STRIPS_CR && export GREP_OPTIONS=-U test_expect_success 'setup' ' conflict_hunks () { |