diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-09-18 18:39:08 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-09-18 18:39:08 +0200 |
| commit | 9c6405fefaf7311b31591ab445660e8f34d64295 (patch) | |
| tree | 87aa09ef6a2f9d33d2d19ef56d3e76e57114d361 /.gitattributes | |
| parent | f4fe138321092c8dcd02caf22bdbad9698ee6829 (diff) | |
| parent | 79140b03839a6b46a92736bd2ce03cefd43a5058 (diff) | |
| download | mariadb-git-9c6405fefaf7311b31591ab445660e8f34d64295.tar.gz | |
Commit resolved conflicts
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index e2d8e1a836c..8aedbaa83d7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,6 +20,9 @@ storage/connect/mysql-test/connect/std_data/*.dat binary # 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 |