summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2016-03-20 14:07:47 +0100
committerLars Magne Ingebrigtsen <larsi@gnus.org>2016-03-20 14:07:47 +0100
commit565df7265dd73b4812fcb02cd1663fce4dc40be7 (patch)
tree580be2588ef5a5877949f154ec2f21b0aee55006 /.gitattributes
parentebe63f43dfa6912ba8f2d4fd509392d34d77f36e (diff)
downloademacs-565df7265dd73b4812fcb02cd1663fce4dc40be7.tar.gz
Allow the shr test files to have trailing blank space.
* .gitattributes: Allow the shr test files to have trailing blank space.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes3
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