projects / ceph.git / blame
| Commit | Line | Data |
|---|---|---|
| 1d09f67e TL |
1 | ############################################################################### |
| 2 | # Set default behavior to automatically normalize line endings. | |
| 3 | ############################################################################### | |
| 4 | * text=auto | |
| 5 | ||
| 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 | #*.cs diff=csharp | |
| 14 | ||
| 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 | #*.sln merge=binary | |
| 26 | #*.csproj merge=binary | |
| 27 | #*.vbproj merge=binary | |
| 28 | #*.vcxproj merge=binary | |
| 29 | #*.vcproj merge=binary | |
| 30 | #*.dbproj merge=binary | |
| 31 | #*.fsproj merge=binary | |
| 32 | #*.lsproj merge=binary | |
| 33 | #*.wixproj merge=binary | |
| 34 | #*.modelproj merge=binary | |
| 35 | #*.sqlproj merge=binary | |
| 36 | #*.wwaproj merge=binary |