[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 565df72 2/2: Allow the shr test files to have trail
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 565df72 2/2: Allow the shr test files to have trailing blank space. |
Date: |
Sun, 20 Mar 2016 13:08:12 +0000 |
branch: master
commit 565df7265dd73b4812fcb02cd1663fce4dc40be7
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>
Allow the shr test files to have trailing blank space.
* .gitattributes: Allow the shr test files to have trailing
blank space.
---
.gitattributes | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/.gitattributes b/.gitattributes
index 13e58a8..24fe4c7 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