summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Allsopp <david.allsopp@metastack.com>2018-02-07 15:35:10 +0000
committerDavid Allsopp <david.allsopp@metastack.com>2018-06-13 09:39:52 +0100
commit3da8ec307994172e4e389c615a25c06184a7785b (patch)
treed1818108ec6002f3289f11dc688dc0a86fbe1493
parent46b20e09bb5b2b0f3497743a8fee0dd20da57ff9 (diff)
downloadocaml-3da8ec307994172e4e389c615a25c06184a7785b.tar.gz
Minor tweak to .gitattributes
-rw-r--r--.gitattributes10
1 files changed, 9 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index 1c0da70ca1..e745320002 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -144,6 +144,8 @@ manual/tools/texexpand text eol=lf
# Tests which include references spanning multiple lines fail with \r\n
# endings, so use \n endings only, even on Windows.
+testsuite/tests/basic-more/morematch.ml text eol=lf
+testsuite/tests/basic-more/robustmatch.ml text eol=lf
testsuite/tests/parsing/*.ml text eol=lf
testsuite/tests/docstrings/empty.ml text eol=lf
testsuite/tests/functors/functors.ml text eol=lf
@@ -152,6 +154,7 @@ testsuite/tests/typing-objects-bugs/pr3968_bad.ml text eol=lf
testsuite/tests/typing-recmod/t12bad.ml text eol=lf
testsuite/tests/typing-safe-linking/b_bad.ml text eol=lf
testsuite/tests/warnings/w04.ml text eol=lf
+testsuite/tests/warnings/w04_failure.ml text eol=lf
testsuite/tests/warnings/w32.ml text eol=lf
# These are forced to \n to allow the Cygwin testsuite to pass on a
@@ -159,12 +162,17 @@ testsuite/tests/warnings/w32.ml text eol=lf
testsuite/tests/formatting/margins.ml text eol=lf
testsuite/tests/letrec-disallowed/disallowed.ml text eol=lf
testsuite/tests/letrec-disallowed/extension_constructor.ml text eol=lf
-testsuite/tests/letrec-disallowed/float_block.ml text eol=lf
+testsuite/tests/letrec-disallowed/float_block_allowed.ml text eol=lf
+testsuite/tests/letrec-disallowed/float_block_disallowed.ml text eol=lf
testsuite/tests/letrec-disallowed/generic_arrays.ml text eol=lf
+testsuite/tests/letrec-disallowed/lazy_.ml text eol=lf
testsuite/tests/letrec-disallowed/module_constraints.ml text eol=lf
+testsuite/tests/letrec-disallowed/unboxed.ml text eol=lf
testsuite/tests/letrec-disallowed/pr7215.ml text eol=lf
+testsuite/tests/letrec-disallowed/pr7231.ml text eol=lf
testsuite/tests/lexing/uchar_esc.ml text eol=lf
testsuite/tests/match-exception-warnings/exhaustiveness_warnings.ml text eol=lf
+testsuite/tests/tool-toplevel/pr7060.ml text eol=lf
testsuite/tests/typing-extension-constructor/test.ml text eol=lf
testsuite/tests/typing-extensions/extensions.ml text eol=lf
testsuite/tests/typing-extensions/open_types.ml text eol=lf