mirror of
https://github.com/danieleteti/delphimvcframework.git
synced 2024-11-17 08:45:55 +01:00
23 lines
483 B
Plaintext
23 lines
483 B
Plaintext
|
# Auto detect text files and perform no LF normalization
|
||
|
* binary
|
||
|
|
||
|
# Custom for Visual Studio
|
||
|
*.cs diff=csharp
|
||
|
*.sln merge=union
|
||
|
*.csproj merge=union
|
||
|
*.vbproj merge=union
|
||
|
*.fsproj merge=union
|
||
|
*.dbproj merge=union
|
||
|
|
||
|
# Standard to msysgit
|
||
|
*.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
|