merge=touch for package meta files
authorMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 09:01:48 +0000 (11:01 +0200)
committerMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 09:01:48 +0000 (11:01 +0200)
.gitattributes [new file with mode: 0644]

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