summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Allsopp <david.allsopp@metastack.com>2017-08-11 12:32:26 +0100
committerDavid Allsopp <david.allsopp@metastack.com>2017-08-12 11:16:22 +0100
commitcfdfd7e87682a9118566685a4626e0330e057ba6 (patch)
tree30e7813b4d3a3c904279abd1c3ae35f7471460d7
parent25c2d326333193e11e093c3816a4f815c5dc316b (diff)
downloadocaml-cfdfd7e87682a9118566685a4626e0330e057ba6.tar.gz
Fix Cygwin testsuite problems on \r\n checkout
-rw-r--r--.gitattributes3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 6a0dddbb44..ac1919061f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -142,6 +142,7 @@ testsuite/tests/warnings/w04.ml text eol=lf
# These are forced to \n to allow the Cygwin testsuite to pass on a
# Windows-checkout
testsuite/tests/formatting/margins.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/typing-extension-constructor/test.ml text eol=lf
testsuite/tests/typing-extensions/extensions.ml text eol=lf
@@ -163,9 +164,11 @@ testsuite/tests/typing-warnings/ambiguous_guarded_disjunction.ml text eol=lf
testsuite/tests/typing-warnings/application.ml text eol=lf
testsuite/tests/typing-warnings/coercions.ml text eol=lf
testsuite/tests/typing-warnings/exhaustiveness.ml text eol=lf
+testsuite/tests/typing-warnings/pr6587.ml text eol=lf
testsuite/tests/typing-warnings/pr6872.ml text eol=lf
testsuite/tests/typing-warnings/pr7085.ml text eol=lf
testsuite/tests/typing-warnings/pr7115.ml text eol=lf
+testsuite/tests/typing-warnings/pr7261.ml text eol=lf
testsuite/tests/typing-warnings/pr7297.ml text eol=lf
testsuite/tests/typing-warnings/records.ml text eol=lf
testsuite/tests/typing-warnings/unused_types.ml text eol=lf