projects / m6w6 / ext-raphf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree | github
raw | patch | inline | side by side (parent: d07c388)
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] patch | blob

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
Resource and persistent handles factory