merge=touch for package meta files

[m6w6/ext-raphf] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..0c2cd57
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+package.xml            merge=touch
+php_raphf.h            merge=touch