diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-11 20:20:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-11 20:20:35 +0200 |
| commit | 810cf362eae28d4a096e0acea7efa67dd32aa05b (patch) | |
| tree | 4f7b2f858e8a57022e790bcac6d88b5e3451ee0f /.gitattributes | |
| parent | a99efc00a68fe2406343e63b67fc4ea58bed345a (diff) | |
| parent | d199a0ffb0aac86881ea2db7dd78bc07b438dc67 (diff) | |
| download | mariadb-git-810cf362eae28d4a096e0acea7efa67dd32aa05b.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 2e238207619..b62a174c5e5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,12 +12,16 @@ # These files should be checked out as is *.result -text -whitespace +*.dat -text -whitespace + storage/connect/mysql-test/connect/std_data/*.txt -text -storage/connect/mysql-test/connect/std_data/*.dat -text # Denote all files that are truly binary and should not be modified. *.png binary *.jpg binary +*.frm binary +*.MYD binary +*.MYI binary *.c diff=cpp *.h diff=cpp |