Fix line endings

Author: vitali-pr

.gitattributes

@@ -1,63 +1,63 @@
-###############################################################################
-# Set default behavior to automatically normalize line endings.
-###############################################################################
+# Set the default behavior, in case people don't have core.autocrlf set.
 * text=auto
 
-###############################################################################
-# Set default behavior for command prompt diff.
-#
-# This is need for earlier builds of msysgit that does not have it on by
-# default for csharp files.
-# Note: This is only used by command line
-###############################################################################
-#*.cs     diff=csharp
+# Explicitly declare text files you want to always be normalized and converted
+# to LF line endings on checkout.
+*.afm text eol=lf
+*.cmap text eol=lf
+*.cs text eol=lf ident
+*.css text eol=lf
+*.htm text eol=lf
+*.html text eol=lf
+*.java text eol=lf ident
+*.lng text eol=lf
+*.md text eol=lf
+*.pom text eol=lf
+*.properties text eol=lf
+*.svg text eol=lf
+*.txt text eol=lf
+*.xfdf text eol=lf
+*.xht text eol=lf
+*.xhtml text eol=lf
+*.xml text eol=lf
+*.json text eol=lf
+port-hash text eol=lf
 
-###############################################################################
-# Set the merge driver for project and solution files
-#
-# Merging from the command prompt will add diff markers to the files if there
-# are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following 
-# file extensions to fail to load in VS. An alternative would be to treat
-# these files as binary and thus will always conflict and require user
-# intervention with every merge. To do so, just uncomment the entries below
-###############################################################################
-#*.sln       merge=binary
-#*.csproj    merge=binary
-#*.vbproj    merge=binary
-#*.vcxproj   merge=binary
-#*.vcproj    merge=binary
-#*.dbproj    merge=binary
-#*.fsproj    merge=binary
-#*.lsproj    merge=binary
-#*.wixproj   merge=binary
-#*.modelproj merge=binary
-#*.sqlproj   merge=binary
-#*.wwaproj   merge=binary
+# Declare files that will always have CRLF line endings on checkout.
+*.bat text eol=crlf
+*.csproj text eol=crlf
+*.sln text eol=crlf
 
-###############################################################################
-# behavior for image files
-#
-# image files are treated as binary by default.
-###############################################################################
-#*.jpg   binary
-#*.png   binary
-#*.gif   binary
-
-###############################################################################
-# diff behavior for common document formats
-# 
-# Convert binary document formats to text before diffing them. This feature
-# is only available from the command line. Turn it on by uncommenting the 
-# entries below.
-###############################################################################
-#*.doc   diff=astextplain
-#*.DOC   diff=astextplain
-#*.docx  diff=astextplain
-#*.DOCX  diff=astextplain
-#*.dot   diff=astextplain
-#*.DOT   diff=astextplain
-#*.pdf   diff=astextplain
-#*.PDF   diff=astextplain
-#*.rtf   diff=astextplain
-#*.RTF   diff=astextplain
+# Denote all files that are truly binary and should not be modified.
+*.aif binary
+*.aiff binary
+*.bmp binary
+*.cer binary
+*.cmp binary
+*.crt binary
+*.dib binary
+*.gif binary
+*.icc binary
+*.j2k binary
+*.jb2 binary
+*.jp2 binary
+*.jpc binary
+*.jpg binary
+*.key binary
+*.otf binary
+*.p12 binary
+*.pdf binary
+*.pfb binary
+*.pfm binary
+*.png binary
+*.snd binary
+*.tif binary
+*.tiff binary
+*.ttc binary
+*.ttf binary
+*.u3d binary
+*.wav binary
+*.wmf binary
+*.woff binary
+*.woff2 binary
+*.dat binary