X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=.gitattributes;h=715993274e64dc0ea64acddd9c2faa567e2e5a9b;hp=e52f7caa2e393a763542c4c0b8df6bdf6a728658;hb=f6a612bfd0eb7ff179c013f3226b6a7790bb4d82;hpb=a92f3562e87cae473417b4a2c82001ed2a93951d

diff --git a/.gitattributes b/.gitattributes
index e52f7ca..7159932 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,4 @@
 package.xml		merge=touch
+php_http.h		merge=touch
+.travis.yml		merge=touch
+/tests/data/bug71719.bin	-diff -text