1 ###############################################################################
\r
2 # Set default behavior to automatically normalize line endings.
\r
3 ###############################################################################
\r
7 ###############################################################################
\r
8 # Set default behavior for command prompt diff.
\r
10 # This is need for earlier builds of msysgit that does not have it on by
\r
11 # default for csharp files.
\r
12 # Note: This is only used by command line
\r
13 ###############################################################################
\r
16 ###############################################################################
\r
17 # Set the merge driver for project and solution files
\r
19 # Merging from the command prompt will add diff markers to the files if there
\r
20 # are conflicts (Merging from VS is not affected by the settings below, in VS
\r
21 # the diff markers are never inserted). Diff markers may cause the following
\r
22 # file extensions to fail to load in VS. An alternative would be to treat
\r
23 # these files as binary and thus will always conflict and require user
\r
24 # intervention with every merge. To do so, just uncomment the entries below
\r
25 ###############################################################################
\r
27 #*.csproj merge=binary
\r
28 #*.vbproj merge=binary
\r
29 #*.vcxproj merge=binary
\r
30 #*.vcproj merge=binary
\r
31 #*.dbproj merge=binary
\r
32 #*.fsproj merge=binary
\r
33 #*.lsproj merge=binary
\r
34 #*.wixproj merge=binary
\r
35 #*.modelproj merge=binary
\r
36 #*.sqlproj merge=binary
\r
37 #*.wwaproj merge=binary
\r
39 ###############################################################################
\r
40 # behavior for image files
\r
42 # image files are treated as binary by default.
\r
43 ###############################################################################
\r
48 ###############################################################################
\r
49 # diff behavior for common document formats
\r
51 # Convert binary document formats to text before diffing them. This feature
\r
52 # is only available from the command line. Turn it on by uncommenting the
\r
54 ###############################################################################
\r
55 #*.doc diff=astextplain
\r
56 #*.DOC diff=astextplain
\r
57 #*.docx diff=astextplain
\r
58 #*.DOCX diff=astextplain
\r
59 #*.dot diff=astextplain
\r
60 #*.DOT diff=astextplain
\r
61 #*.pdf diff=astextplain
\r
62 #*.PDF diff=astextplain
\r
63 #*.rtf diff=astextplain
\r
64 #*.RTF diff=astextplain
\r