From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 10 Jan 2016 08:51:10 +0000 (-0800)
Subject: * .gitattributes: *.cur and *.pif are binary files too.
X-Git-Tag: emacs-25.0.90~214
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/684eb58db992dec56a05719732edc547fa77c1be

* .gitattributes: *.cur and *.pif are binary files too.
---

diff --git a/.gitattributes b/.gitattributes
index 8f61c807d7..5ccf9a5eab 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -34,12 +34,14 @@ test/etags/html-src/algrthms.html whitespace=cr-at-eol
 doc/misc/texinfo.tex -whitespace=blank-at-eol
 
 # Some files should not be treated as text when diffing or merging.
+*.cur binary
 *.gpg binary
 *.gz binary
 *.icns binary
 *.ico binary
 *.pbm binary
 *.pdf binary
+*.pif binary
 *.png binary
 *.sig binary
 *.tiff binary