You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
|
|
################################################################################ Set default behavior to automatically normalize line endings.###############################################################################* text=auto*.cs text eol=lf*.py text eol=lf*.sh text eol=lf################################################################################ 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=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################################################################################ 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
|
