diff options
| author | Lars Magne Ingebrigtsen | 2016-04-24 15:18:22 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2016-04-24 15:18:29 +0200 |
| commit | 331f4a638150c1ab8ae5bea86b901f32263b9192 (patch) | |
| tree | 9c230d68703861322b8252e5d2191b24ef650766 /.gitattributes | |
| parent | 8e2e252932faf3320f72a0b62136c4606e09ebc3 (diff) | |
| download | emacs-331f4a638150c1ab8ae5bea86b901f32263b9192.tar.gz emacs-331f4a638150c1ab8ae5bea86b901f32263b9192.zip | |
Encode the shr tests files with trailing white space
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes index 24fe4c7acfa..13e58a87e9f 100644 --- a/.gitattributes +++ b/.gitattributes | |||
| @@ -33,9 +33,6 @@ test/etags/html-src/algrthms.html whitespace=cr-at-eol | |||
| 33 | # The upstream maintainer does not want to remove trailing whitespace. | 33 | # The upstream maintainer does not want to remove trailing whitespace. |
| 34 | doc/misc/texinfo.tex -whitespace=blank-at-eol | 34 | doc/misc/texinfo.tex -whitespace=blank-at-eol |
| 35 | 35 | ||
| 36 | # The shr test files can have trailing whitespace. | ||
| 37 | test/data/shr/*.txt -whitespace=blank-at-eol | ||
| 38 | |||
| 39 | # Some files should not be treated as text when diffing or merging. | 36 | # Some files should not be treated as text when diffing or merging. |
| 40 | *.cur binary | 37 | *.cur binary |
| 41 | *.gpg binary | 38 | *.gpg binary |