annotate testbot/DCPUToolBot-master/.gitattributes @ 2766:9c3ea172d200

<ThatOtherPerson> mv d/DCPUToolBot-master testbot
author HackBot
date Mon, 22 Apr 2013 15:41:51 +0000
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2766
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
1 # Auto detect text files and perform LF normalization
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
2 * text=auto
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
3
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
4 # Custom for Visual Studio
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
5 *.cs diff=csharp
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
6 *.sln merge=union
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
7 *.csproj merge=union
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
8 *.vbproj merge=union
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
9 *.fsproj merge=union
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
10 *.dbproj merge=union
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
11
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
12 # Standard to msysgit
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
13 *.doc diff=astextplain
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
14 *.DOC diff=astextplain
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
15 *.docx diff=astextplain
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
16 *.DOCX diff=astextplain
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
17 *.dot diff=astextplain
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
18 *.DOT diff=astextplain
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
19 *.pdf diff=astextplain
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
20 *.PDF diff=astextplain
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
21 *.rtf diff=astextplain
9c3ea172d200 <ThatOtherPerson> mv d/DCPUToolBot-master testbot
HackBot
parents:
diff changeset
22 *.RTF diff=astextplain