X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=.gitattributes;h=ffc24946fc8323688f7ea273e43f7dc87cca22ca;hp=40a888438919e2b134fc35b8e5f61398e071a488;hb=HEAD;hpb=1ebe4d9f8e3e0d301809b9279ba428ba829b7f17

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