|
| 1 | +############################################################################### |
| 2 | +# Set default behavior to automatically normalize line endings. |
| 3 | +############################################################################### |
| 4 | +* text=auto |
| 5 | + |
| 6 | +# Shell scripts should always use line feed not crlf |
| 7 | +*.sh text eol=lf |
| 8 | + |
| 9 | +############################################################################### |
| 10 | +# Set default behavior for command prompt diff. |
| 11 | +# |
| 12 | +# This is need for earlier builds of msysgit that does not have it on by |
| 13 | +# default for csharp files. |
| 14 | +# Note: This is only used by command line |
| 15 | +############################################################################### |
| 16 | +#*.cs diff=csharp |
| 17 | + |
| 18 | +############################################################################### |
| 19 | +# Set the merge driver for project and solution files |
| 20 | +# |
| 21 | +# Merging from the command prompt will add diff markers to the files if there |
| 22 | +# are conflicts (Merging from VS is not affected by the settings below, in VS |
| 23 | +# the diff markers are never inserted). Diff markers may cause the following |
| 24 | +# file extensions to fail to load in VS. An alternative would be to treat |
| 25 | +# these files as binary and thus will always conflict and require user |
| 26 | +# intervention with every merge. To do so, just uncomment the entries below |
| 27 | +############################################################################### |
| 28 | +*.js text |
| 29 | +*.json text |
| 30 | +*.resjson text |
| 31 | +*.htm text |
| 32 | +*.html text |
| 33 | +*.xml text |
| 34 | +*.txt text |
| 35 | +*.ini text |
| 36 | +*.inc text |
| 37 | +#*.sln merge=binary |
| 38 | +#*.csproj merge=binary |
| 39 | +#*.vbproj merge=binary |
| 40 | +#*.vcxproj merge=binary |
| 41 | +#*.vcproj merge=binary |
| 42 | +#*.dbproj merge=binary |
| 43 | +#*.fsproj merge=binary |
| 44 | +#*.lsproj merge=binary |
| 45 | +#*.wixproj merge=binary |
| 46 | +#*.modelproj merge=binary |
| 47 | +#*.sqlproj merge=binary |
| 48 | +#*.wwaproj merge=binary |
| 49 | + |
| 50 | +############################################################################### |
| 51 | +# behavior for image files |
| 52 | +# |
| 53 | +# image files are treated as binary by default. |
| 54 | +############################################################################### |
| 55 | +*.png binary |
| 56 | +*.jpg binary |
| 57 | +*.jpeg binary |
| 58 | +*.gif binary |
| 59 | +*.ico binary |
| 60 | +*.mov binary |
| 61 | +*.mp4 binary |
| 62 | +*.mp3 binary |
| 63 | +*.flv binary |
| 64 | +*.fla binary |
| 65 | +*.swf binary |
| 66 | +*.gz binary |
| 67 | +*.zip binary |
| 68 | +*.7z binary |
| 69 | +*.ttf binary |
| 70 | + |
| 71 | +############################################################################### |
| 72 | +# diff behavior for common document formats |
| 73 | +# |
| 74 | +# Convert binary document formats to text before diffing them. This feature |
| 75 | +# is only available from the command line. Turn it on by uncommenting the |
| 76 | +# entries below. |
| 77 | +############################################################################### |
| 78 | +*.doc diff=astextplain |
| 79 | +*.DOC diff=astextplain |
| 80 | +*.docx diff=astextplain |
| 81 | +*.DOCX diff=astextplain |
| 82 | +*.dot diff=astextplain |
| 83 | +*.DOT diff=astextplain |
| 84 | +*.pdf diff=astextplain |
| 85 | +*.PDF diff=astextplain |
| 86 | +*.rtf diff=astextplain |
| 87 | +*.RTF diff=astextplain |
0 commit comments