From 3233c1f56cfce72c079fc2bc033f16c7f4e3fc68 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Tue, 1 Sep 2015 11:01:48 +0200
Subject: [PATCH] merge=touch for package meta files

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitattributes

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