Mercurial > repo
diff t/DCPUToolBot-master/.gitattributes @ 2777:1b37a020ba4b
<ThatOtherPerson> cp -r d/DCPUToolBot-master t
author | HackBot |
---|---|
date | Mon, 22 Apr 2013 16:08:04 +0000 |
parents | |
children |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/t/DCPUToolBot-master/.gitattributes Mon Apr 22 16:08:04 2013 +0000 @@ -0,0 +1,22 @@ +# 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