From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 30 May 2015 16:33:41 +0000 (-0700)
Subject: Update .gitattributes to match current sources
X-Git-Tag: emacs-25.0.90~1916
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e553c503f4d71e60db1f382c8d9d2348e7b20887;p=emacs.git

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.
---

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