1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980 |
- ###############################################################################
- # Set default behavior to automatically normalize line endings.
- ###############################################################################
- * text=auto
- *.md text
- *.txt text
- ###############################################################################
- # 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
- ###############################################################################
- # 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 text eol=crlf
- *.csproj text eol=crlf
- #*.vbproj merge=binary
- *.vcxproj text eol=crlf
- *.vcxproj.filters text eol=crlf
- *.vcproj text eol=crlf
- *.filters text eol=crlf
- #*.dbproj merge=binary
- #*.fsproj merge=binary
- #*.lsproj merge=binary
- #*.wixproj merge=binary
- #*.modelproj merge=binary
- #*.sqlproj merge=binary
- #*.wwaproj merge=binary
- *.swg text eol=lf
- *.cmd text eol=crlf
- *.bat text eol=crlf
- *.props text eol=crlf
- *.sh text eol=lf
- *.pbxproj text eol=lf
- *.storyboard text eol=lf
- *.plist text eol=lf
- ###############################################################################
- # behavior for image files
- #
- # image files are treated as binary by default.
- ###############################################################################
- *.jpg binary
- *.png binary
- *.gif binary
- *.ttf binary
- *.lib 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
|