X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=.gitattributes;h=ffc24946fc8323688f7ea273e43f7dc87cca22ca;hp=a55a7ae95546df79042da73d8e32162b575db1ff;hb=640b762aa5a5fdf571e44f7a66725c097b7dc0f1;hpb=2c5b3135ab3e8bd0f0cd479b8182fccdd653ed4e

diff --git a/.gitattributes b/.gitattributes
index a55a7ae..ffc2494 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +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