tests: crlf: update Windows test data to reflect Git 2.9+ behavior

csware · csware · commit f65eea449864 · 2018-04-17T19:42:09.000+02:00
Update with "git version 2.11.0.windows.3"

Signed-off-by: Sven Strickroth &lt;email@cs-ware.de&gt;
diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-all-lf b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-all-lf
@@ -1,4 +1,4 @@
-one
-two
-three
-four
+one
+two
+three
+four
diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr
@@ -1,3 +1,3 @@
-one
-twothree
+one
+twothree
 four
diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr-crlf b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr-crlf
@@ -1,3 +1,3 @@
-one
+one
 twothree
 four
diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr
@@ -1,3 +1,3 @@
-one
-twothree
+one
+twothree
 four
diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr-crlf b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr-crlf
@@ -1,3 +1,3 @@
-one
+one
 twothree
 four
diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-crlf b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-crlf
@@ -1,5 +1,5 @@
 crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-crlf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-crlf-utf8bom
@@ -1,5 +1,5 @@
 ﻿crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-lf b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-lf
@@ -1,5 +1,5 @@
-lf
-lf
+lf
+lf
 crlf
-lf
-lf
+lf
+lf
diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-lf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-lf-utf8bom
@@ -1,5 +1,5 @@
-﻿lf
-lf
+﻿lf
+lf
 crlf
-lf
-lf
+lf
+lf
diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-crlf b/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-crlf
@@ -1,5 +1,5 @@
 crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-crlf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-crlf-utf8bom
@@ -1,5 +1,5 @@
 ﻿crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-lf b/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-lf
@@ -1,5 +1,5 @@
-lf
-lf
+lf
+lf
 crlf
-lf
-lf
+lf
+lf
diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-lf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-lf-utf8bom
@@ -1,5 +1,5 @@
-﻿lf
-lf
+﻿lf
+lf
 crlf
-lf
-lf
+lf
+lf
diff --git a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-all-lf b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-all-lf
@@ -1,4 +1,4 @@
-one
-two
-three
-four
+one
+two
+three
+four
diff --git a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr
@@ -1,3 +1,3 @@
-one
-twothree
+one
+twothree
 four
diff --git a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr-crlf b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr-crlf
@@ -1,3 +1,3 @@
-one
+one
 twothree
 four
diff --git a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr
@@ -1,3 +1,3 @@
-one
-twothree
+one
+twothree
 four
diff --git a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr-crlf b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr-crlf
@@ -1,3 +1,3 @@
-one
+one
 twothree
 four
diff --git a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-crlf b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-crlf
@@ -1,5 +1,5 @@
 crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-crlf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-crlf-utf8bom
@@ -1,5 +1,5 @@
 ﻿crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-lf b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-lf
@@ -1,5 +1,5 @@
-lf
-lf
+lf
+lf
 crlf
-lf
-lf
+lf
+lf
diff --git a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-lf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-lf-utf8bom
@@ -1,5 +1,5 @@
-﻿lf
-lf
+﻿lf
+lf
 crlf
-lf
-lf
+lf
+lf
diff --git a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/binary-all-lf b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/binary-all-lf
@@ -1,4 +1,4 @@
-one
-two
-three
-four
+one
+two
+three
+four
diff --git a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr
@@ -1,3 +1,3 @@
-one
-twothree
+one
+twothree
 four
diff --git a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr-crlf b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr-crlf
@@ -1,3 +1,3 @@
-one
+one
 twothree
 four
diff --git a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr
@@ -1,3 +1,3 @@
-one
-twothree
+one
+twothree
 four
diff --git a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr-crlf b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr-crlf
@@ -1,3 +1,3 @@
-one
+one
 twothree
 four
diff --git a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-crlf b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-crlf
@@ -1,5 +1,5 @@
 crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-crlf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-crlf-utf8bom
@@ -1,5 +1,5 @@
 ﻿crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-lf b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-lf
@@ -1,5 +1,5 @@
-lf
-lf
+lf
+lf
 crlf
-lf
-lf
+lf
+lf
diff --git a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-lf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-lf-utf8bom
@@ -1,5 +1,5 @@
-﻿lf
-lf
+﻿lf
+lf
 crlf
-lf
-lf
+lf
+lf
diff --git a/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-crlf b/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-crlf
@@ -1,5 +1,5 @@
 crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-crlf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-crlf-utf8bom
@@ -1,5 +1,5 @@
 ﻿crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-lf b/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-lf
@@ -1,5 +1,5 @@
-lf
-lf
+lf
+lf
 crlf
-lf
-lf
+lf
+lf
diff --git a/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-lf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-lf-utf8bom
@@ -1,5 +1,5 @@
-﻿lf
-lf
+﻿lf
+lf
 crlf
-lf
-lf
+lf
+lf

-Original file line number
+Diff line change
@@ @@ -1,4 +1,4 @@ @@
 -one
 -two
 -three
 -four
 +one
 +two
 +three
 +four
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-one`
`2`		`-twothree`
	`1`	`+one`
	`2`	`+twothree`
`3`	`3`	`four`