diff options
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 13e58a87e9f..24fe4c7acfa 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 |