[PATCH] t3032 - make compatible with systems using \r\n as a line ending

[Mark Levedahl <mlevedahl@gmail.com>]

Subtests 6, 7, and 9 rely test that merge-recursive correctly
ignores whitespace when so directed. Change the particular whitespace
sequences to be ones that are not known line endings so the whitespace
is not changed when being extracted by line oriented grep.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
---
 t/t3032-merge-recursive-options.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
index 2b17311..52e275c 100755
--- a/t/t3032-merge-recursive-options.sh
+++ b/t/t3032-merge-recursive-options.sh
@@ -92,7 +92,7 @@ test_expect_success 'setup' '
 			s/Polemarchus interposing./Polemarchus, interposing.Q/
 			/justice and holiness/ s/$/Q/
 			/pay your debts/ s/$/Q/
-		" text.txt | q_to_cr >text.txt+ &&
+		" text.txt | q_to_tab >text.txt+ &&
 	mv text.txt+ text.txt &&
 	git commit -a -m "Clarify" &&
 	git show-branch --all
@@ -125,7 +125,7 @@ test_expect_success '-Xignore-space-change makes cherry-pick succeed' '
 '
 
 test_expect_success '--ignore-space-change: our w/s-only change wins' '
-	q_to_cr <<-\EOF >expected &&
+	q_to_tab <<-\EOF >expected &&
 	    justice and holiness and is the nurse of his age and theQ
 	EOF
 
@@ -150,7 +150,7 @@ test_expect_success '--ignore-space-change: does not ignore new spaces' '
 	cat <<-\EOF >expected1 &&
 	Well said, Cephalus, I replied; but as con cerning justice, what is
 	EOF
-	q_to_cr <<-\EOF >expected2 &&
+	q_to_tab <<-\EOF >expected2 &&
 	un intentionally; and when he departs to the world below he is not inQ
 	EOF
 
@@ -174,7 +174,7 @@ test_expect_success '--ignore-all-space drops their new spaces' '
 '
 
 test_expect_success '--ignore-all-space keeps our new spaces' '
-	q_to_cr <<-\EOF >expected &&
+	q_to_tab <<-\EOF >expected &&
 	un intentionally; and when he departs to the world below he is not inQ
 	EOF
 
@@ -185,7 +185,7 @@ test_expect_success '--ignore-all-space keeps our new spaces' '
 '
 
 test_expect_success '--ignore-space-at-eol' '
-	q_to_cr <<-\EOF >expected &&
+	q_to_tab <<-\EOF >expected &&
 	<<<<<<< HEAD
 	is not in his right mind; ought I to give them back to him?  No oneQ
 	=======
-- 
1.8.3.2.0.13