X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=.gitattributes;h=ffc24946fc8323688f7ea273e43f7dc87cca22ca;hp=b0aef47cbde05ad2cc0e39899c08abc18ef08d57;hb=ccc68db494d5436acae7254f81ed111780e00d72;hpb=9862a9581510cb9539d5101e69712fc47aa92bfd

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