X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=.gitattributes;h=715993274e64dc0ea64acddd9c2faa567e2e5a9b;hp=b0aef47cbde05ad2cc0e39899c08abc18ef08d57;hb=1eaeb2c133a2e47327fe6cd6282db2a02527e57a;hpb=9862a9581510cb9539d5101e69712fc47aa92bfd diff --git a/.gitattributes b/.gitattributes index b0aef47..7159932 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ package.xml merge=touch php_http.h merge=touch .travis.yml merge=touch +/tests/data/bug71719.bin -diff -text