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

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