From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 4 Feb 2015 02:24:50 +0000 (-0800)
Subject: * .gitattributes: Ignore blanks at EOL in texinfo.tex.
X-Git-Tag: emacs-25.0.90~2008^2~128
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/5b82ae859936ec786ffb7dbefb28500587c34e5a

* .gitattributes: Ignore blanks at EOL in texinfo.tex.
---

diff --git a/.gitattributes b/.gitattributes
index c568ba293d..c3bbf664ce 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -27,6 +27,9 @@ leim/MISC-DIC/pinyin.map -whitespace
 lib-src/update-game-score.exe.manifest -whitespace
 nt/nmake.defs -whitespace
 
+# The upstream maintainer does not want to remove trailing whitespace.
+doc/misc/texinfo.tex -whitespace=blank-at-eol
+
 # Some files should not be treated as text when diffing or merging.
 *.gpg binary
 *.gz binary
diff --git a/ChangeLog b/ChangeLog
index d7fd76cd30..ca9f44aacf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* .gitattributes: Ignore blanks at EOL in texinfo.tex.
+
 2015-01-28  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Merge from gnulib and try to repair bad merge