summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-05-30 09:33:41 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2015-05-30 09:34:37 -0700
commite553c503f4d71e60db1f382c8d9d2348e7b20887 (patch)
treed2fee767986a84cff6e2c6def71f35f9c9c880c3 /.gitattributes
parent83c7e62a3047d6d0e951b51d5114608ba735945a (diff)
downloademacs-e553c503f4d71e60db1f382c8d9d2348e7b20887.tar.gz
Update .gitattributes to match current sources
http://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00879.html * .gitattributes: Accommodate tests that insist on DOS format. Remove test/automated/data/decompress/foo-gzipped. Add etc/e/eterm-color.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes5
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index c3bbf664ceb..4bcb7be7377 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -26,6 +26,9 @@ leim/MISC-DIC/cangjie-table.cns -whitespace
leim/MISC-DIC/pinyin.map -whitespace
lib-src/update-game-score.exe.manifest -whitespace
nt/nmake.defs -whitespace
+test/etags/c-src/dostorture.c -whitespace
+test/etags/cp-src/c.C -whitespace
+test/etags/html-src/algrthms.html -whitespace
# The upstream maintainer does not want to remove trailing whitespace.
doc/misc/texinfo.tex -whitespace=blank-at-eol
@@ -40,4 +43,4 @@ doc/misc/texinfo.tex -whitespace=blank-at-eol
*.png binary
*.sig binary
*.tiff binary
-test/automated/data/decompress/foo-gzipped binary
+etc/e/eterm-color binary