2014-06-15 23:16:56 +02:00
|
|
|
###############################################################################
|
|
|
|
|
# Set default behavior to automatically normalize line endings.
|
|
|
|
|
###############################################################################
|
|
|
|
|
* text=auto
|
|
|
|
|
*.cpp text
|
|
|
|
|
*.c text
|
|
|
|
|
*.inl text
|
|
|
|
|
*.h text
|
2014-07-08 22:27:40 +02:00
|
|
|
*.md text
|
|
|
|
|
*.natvis eol=crlf
|
2014-06-15 22:56:44 +02:00
|
|
|
*.sln text eol=crlf
|
2014-06-15 23:16:56 +02:00
|
|
|
*.vcxproj text eol=crlf
|
2014-07-10 11:57:05 +02:00
|
|
|
*.vcxproj.filters text eol=crlf
|
|
|
|
|
*.ui text
|
|
|
|
|
*.pro text
|
|
|
|
|
|
2014-06-15 23:16:56 +02:00
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
# 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 merge=astextplain
|
|
|
|
|
#*.csproj merge=astextplain
|
|
|
|
|
#*.vbproj merge=astextplain
|
|
|
|
|
*.vcxproj merge=astextplain
|
2014-07-10 11:57:05 +02:00
|
|
|
*.vcxproj.filters merge=astextplain
|
2014-06-15 23:16:56 +02:00
|
|
|
#*.vcproj merge=astextplain
|
|
|
|
|
#*.dbproj merge=astextplain
|
|
|
|
|
#*.fsproj merge=astextplain
|
|
|
|
|
#*.lsproj merge=astextplain
|
|
|
|
|
#*.wixproj merge=astextplain
|
|
|
|
|
#*.modelproj merge=astextplain
|
|
|
|
|
#*.sqlproj merge=astextplain
|
|
|
|
|
#*.wwaproj merge=astextplain
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
# 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
|
