[[ Diff ]] Reset line endings and disable automatic conversion of test files

livecodeian · livecodeian · commit c3756f3adea5 · 2017-01-18T13:14:28.000Z
diff --git a/extensions/script-libraries/diff/test/test_line_endings/.gitattributes b/extensions/script-libraries/diff/test/test_line_endings/.gitattributes
@@ -0,0 +1,2 @@
+# Disable eol conversion for this folder
+* -text
diff --git a/extensions/script-libraries/diff/test/test_line_endings/crlf.txt b/extensions/script-libraries/diff/test/test_line_endings/crlf.txt
@@ -1,5 +1,5 @@
-This file uses CRLF
-
-a
-b
-c
+This file uses CRLF
+
+a
+b
+c
diff --git a/extensions/script-libraries/diff/test/test_line_endings/crlf_lf.diff b/extensions/script-libraries/diff/test/test_line_endings/crlf_lf.diff
@@ -1,11 +1,11 @@
---- crlf.txt	2017-01-06 17:09:39.000000000 +0000
-+++ lf.txt	2017-01-06 17:10:08.000000000 +0000
+--- crlf.txt	2017-01-18 13:06:30.615558038 +0000
++++ lf.txt	2017-01-18 10:45:52.218466057 +0000
 @@ -1,5 +1,5 @@
--This file uses CRLF
--
--a
--b
--c
+-This file uses CRLF
+-
+-a
+-b
+-c
 +This file uses LF
 +
 +a
diff --git a/extensions/script-libraries/diff/test/test_line_endings/lf_crlf.diff b/extensions/script-libraries/diff/test/test_line_endings/lf_crlf.diff
@@ -1,13 +1,13 @@
---- lf.txt	2017-01-06 17:10:08.000000000 +0000
-+++ crlf.txt	2017-01-06 17:09:39.000000000 +0000
+--- lf.txt	2017-01-18 10:45:52.218466057 +0000
++++ crlf.txt	2017-01-18 13:06:30.615558038 +0000
 @@ -1,5 +1,5 @@
 -This file uses LF
 -
 -a
 -b
 -c
-+This file uses CRLF
-+
-+a
-+b
-+c
++This file uses CRLF
++
++a
++b
++c

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Disable eol conversion for this folder`
	`2`	`+* -text`
-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 -This file uses CRLF
+-
 -a
 -b
 -c
 +This file uses CRLF
++
 +a
 +b
 +c