Exclude .travis.xml and CMakeLists from merging

mariadb-corporation · Feb 9, 2023 · 916000e · 916000e
1 parent e4417e7
commit 916000e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -4,3 +4,7 @@
 # Prevent certain files from being exported:
 .gitattributes  export-ignore
 .gitignore      export-ignore
+
+# merge
+.travis.yml     merge=cc
+CMakeLists.txt  merge=cc