procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Paul Eggert 2015-02-03 18:24:50 -08:00
parent 200a47d45c
commit 5b82ae8599
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitattributes vendored
View file

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

4
ChangeLog
View file

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