https://github.com/PressForward/pressforward
Raw File
Tip revision: b0b03de06dff88c8b86d955d3040b9e8de821328 authored by Aram Zucker-Scharff on 11 November 2013, 02:27:12 UTC
Critical fix for #153 merging bugfix branch
Tip revision: b0b03de
.gitattributes
# Auto detect text files and perform LF normalization
* text=auto

# 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
back to top