From 5b82ae859936ec786ffb7dbefb28500587c34e5a Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 3 Feb 2015 18:24:50 -0800 Subject: [PATCH] * .gitattributes: Ignore blanks at EOL in texinfo.tex. --- .gitattributes | 3 +++ ChangeLog | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/.gitattributes b/.gitattributes index c568ba293da..c3bbf664ceb 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 d7fd76cd305..ca9f44aacf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-02-04 Paul Eggert + + * .gitattributes: Ignore blanks at EOL in texinfo.tex. + 2015-01-28 Paul Eggert Merge from gnulib and try to repair bad merge -- 2.39.5