X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=.gitattributes;h=ffc24946fc8323688f7ea273e43f7dc87cca22ca;hp=40a888438919e2b134fc35b8e5f61398e071a488;hb=ba429472d56e45d8ce65d47ec0b5027f3bba4407;hpb=61279745dda8d178a049a71d9f8b8fce0f245ab3 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