diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2016-05-22 14:49:14 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2016-05-22 14:49:14 +0200 |
| commit | f8bc587c1ac19c614f813479b89945bea8f10c73 (patch) | |
| tree | e5af37f8091f5bee276edd96895ceb08566a5bae /.gitattributes | |
| parent | 77dd5ece06904aa10c3fe05b9493cf3231edcd85 (diff) | |
| parent | 9c9747fed3e1c1a7838e45c71983a3c4bbd3160d (diff) | |
| download | mariadb-git-f8bc587c1ac19c614f813479b89945bea8f10c73.tar.gz | |
Merge branch '10.1' of https://github.com/MariaDB/server into ob-10.1
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitattributes b/.gitattributes index d11f2120249..266acd5812a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11,12 +11,12 @@ *.test text *.java text -# Declare files that will always have LF line endings on checkout. -*.result text eol=lf +# These files should be checked out as is +*.result -text -whitespace +*.dat -text -whitespace -# Denote the files that should not be modified. -storage/connect/mysql-test/connect/std_data/*.txt binary -storage/connect/mysql-test/connect/std_data/*.dat binary +storage/connect/mysql-test/connect/std_data/*.txt -text +pcre/testdata/greppatN4 -text # Denote all files that are truly binary and should not be modified. *.png binary |