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