X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ebe63f43dfa6912ba8f2d4fd509392d34d77f36e..565df7265dd73b4812fcb02cd1663fce4dc40be7:/.gitattributes diff --git a/.gitattributes b/.gitattributes index 13e58a87e9..24fe4c7acf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -33,6 +33,9 @@ test/etags/html-src/algrthms.html whitespace=cr-at-eol # The upstream maintainer does not want to remove trailing whitespace. doc/misc/texinfo.tex -whitespace=blank-at-eol +# The shr test files can have trailing whitespace. +test/data/shr/*.txt -whitespace=blank-at-eol + # Some files should not be treated as text when diffing or merging. *.cur binary *.gpg binary