1
+ # ##############################################################################
2
+ # Set default behavior to automatically normalize line endings.
3
+ # ##############################################################################
4
+ * text =auto
5
+
6
+ * linguist-vendored
7
+ * .cs linguist-vendored =false
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
+ # *.sln merge=binary
29
+ # *.csproj merge=binary
30
+ # *.vbproj merge=binary
31
+ # *.vcxproj merge=binary
32
+ # *.vcproj merge=binary
33
+ # *.dbproj merge=binary
34
+ # *.fsproj merge=binary
35
+ # *.lsproj merge=binary
36
+ # *.wixproj merge=binary
37
+ # *.modelproj merge=binary
38
+ # *.sqlproj merge=binary
39
+ # *.wwaproj merge=binary
40
+
41
+ # ##############################################################################
42
+ # behavior for image files
43
+ #
44
+ # image files are treated as binary by default.
45
+ # ##############################################################################
46
+ # *.jpg binary
47
+ # *.png binary
48
+ # *.gif binary
49
+
50
+ # ##############################################################################
51
+ # diff behavior for common document formats
52
+ #
53
+ # Convert binary document formats to text before diffing them. This feature
54
+ # is only available from the command line. Turn it on by uncommenting the
55
+ # entries below.
56
+ # ##############################################################################
57
+ # *.doc diff=astextplain
58
+ # *.DOC diff=astextplain
59
+ # *.docx diff=astextplain
60
+ # *.DOCX diff=astextplain
61
+ # *.dot diff=astextplain
62
+ # *.DOT diff=astextplain
63
+ # *.pdf diff=astextplain
64
+ # *.PDF diff=astextplain
65
+ # *.rtf diff=astextplain
66
+ # *.RTF diff=astextplain
0 commit comments