X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/4869e0d85a215e7fb0262430a48aa4d5804bf0a4..2cbd80a5f8a75aa7516a9f0cc467b72c05e94b4a:/.gitattributes diff --git a/.gitattributes b/.gitattributes index 24fe4c7acf..13e58a87e9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -33,9 +33,6 @@ 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