|
1 | | -############################################################################### |
2 | 1 | # Set default behavior to automatically normalize line endings. |
3 | | -############################################################################### |
| 2 | + |
4 | 3 | * text=auto |
5 | 4 |
|
6 | | -############################################################################### |
7 | | -# Set default behavior for command prompt diff. |
8 | | -# |
9 | | -# This is need for earlier builds of msysgit that does not have it on by |
10 | | -# default for csharp files. |
11 | | -# Note: This is only used by command line |
12 | | -############################################################################### |
13 | 5 | #*.cs diff=csharp |
14 | 6 |
|
15 | | -############################################################################### |
16 | | -# Set the merge driver for project and solution files |
17 | | -# |
18 | | -# Merging from the command prompt will add diff markers to the files if there |
19 | | -# are conflicts (Merging from VS is not affected by the settings below, in VS |
20 | | -# the diff markers are never inserted). Diff markers may cause the following |
21 | | -# file extensions to fail to load in VS. An alternative would be to treat |
22 | | -# these files as binary and thus will always conflict and require user |
23 | | -# intervention with every merge. To do so, just uncomment the entries below |
24 | | -############################################################################### |
25 | 7 | #*.sln merge=binary |
26 | 8 | #*.csproj merge=binary |
27 | 9 | #*.vbproj merge=binary |
|
35 | 17 | #*.sqlproj merge=binary |
36 | 18 | #*.wwaproj merge=binary |
37 | 19 |
|
38 | | -############################################################################### |
39 | | -# behavior for image files |
40 | | -# |
41 | | -# image files are treated as binary by default. |
42 | | -############################################################################### |
43 | 20 | #*.jpg binary |
44 | 21 | #*.png binary |
45 | 22 | #*.gif binary |
46 | 23 |
|
47 | | -############################################################################### |
48 | | -# diff behavior for common document formats |
49 | | -# |
50 | | -# Convert binary document formats to text before diffing them. This feature |
51 | | -# is only available from the command line. Turn it on by uncommenting the |
52 | | -# entries below. |
53 | | -############################################################################### |
54 | 24 | #*.doc diff=astextplain |
55 | 25 | #*.DOC diff=astextplain |
56 | 26 | #*.docx diff=astextplain |
|
0 commit comments