diff options
| author | Damien Doligez <damien.doligez@inria.fr> | 2017-07-18 13:03:54 +0200 |
|---|---|---|
| committer | Damien Doligez <damien.doligez@inria.fr> | 2017-07-18 13:03:54 +0200 |
| commit | f78128a7d723fa6002a08f5379a565da5022006a (patch) | |
| tree | c4eec7c3cfd1f5a93a41e2223b525292ecd3f003 /.gitattributes | |
| parent | d6bb4daa64d300d72a68b63e014076d7095ba65d (diff) | |
| parent | 2d03974c1223bbd3f1535fde1be2f03148bbed82 (diff) | |
| download | ocaml-f78128a7d723fa6002a08f5379a565da5022006a.tar.gz | |
merge 4.05 into trunk
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index f78a284521..f4bdc362e6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -157,10 +157,12 @@ testsuite/tests/typing-typeparam/newtype.ml text eol=lf testsuite/tests/typing-unboxed/test.ml text eol=lf testsuite/tests/typing-unboxed-types/test.ml text eol=lf 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/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/pr7297.ml text eol=lf testsuite/tests/typing-warnings/records.ml text eol=lf testsuite/tests/typing-warnings/unused_types.ml text eol=lf |