diff options
| author | Martijn Hoekstra <Martijn Hoekstra> | 2016-09-03 12:10:53 +0200 |
|---|---|---|
| committer | Martijn Hoekstra <Martijn Hoekstra> | 2016-09-07 22:32:51 +0200 |
| commit | 32819e2edc88dd06095704c04ed9c2dd0603386f (patch) | |
| tree | 5ac33b7a4fc11fe5b13aeae26e963e5553e97fad /.gitattributes | |
| parent | 6bce106fea7ce10eefc864a6e7c1351675065880 (diff) | |
| download | dotty-32819e2edc88dd06095704c04ed9c2dd0603386f.tar.gz dotty-32819e2edc88dd06095704c04ed9c2dd0603386f.tar.bz2 dotty-32819e2edc88dd06095704c04ed9c2dd0603386f.zip | |
honor -encoding compiler flag and defaults
rename test/pos/valueclasses to pos_valueclasses
tests/pos/valueclasses generates a valueclasses.flags
file in /tests/partest-generated/pos that conflicts
with the valueClasses.flags file that
tests/neg/valueClasses.scala tries to create
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/.gitattributes b/.gitattributes index d9d8b125c..a4689a686 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,15 +1,16 @@ # These files are text and should be normalized (convert crlf => lf) -*.c text -*.check text -*.css text -*.html text -*.java text -*.js text -*.sbt text -*.scala text -*.sh text -*.txt text -*.xml text + +*.c text eol=lf +*.check text eol=lf +*.css text eol=lf +*.html text eol=lf +*.java text eol=lf +*.js text eol=lf +*.sbt text eol=lf +*.scala text eol=lf +*.sh text eol=lf +*.txt text eol=lf +*.xml text eol=lf # Windows-specific files get windows endings *.bat eol=crlf |