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 | |||
| 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 | |||
| 36 | # Some files should not be treated as text when diffing or merging. | 39 | # Some files should not be treated as text when diffing or merging. |
| 37 | *.cur binary | 40 | *.cur binary |
| 38 | *.gpg binary | 41 | *.gpg binary |