diff options
Diffstat (limited to 'src/arrow/csharp/.gitattributes')
| -rw-r--r-- | src/arrow/csharp/.gitattributes | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/src/arrow/csharp/.gitattributes b/src/arrow/csharp/.gitattributes new file mode 100644 index 000000000..d2ff52b12 --- /dev/null +++ b/src/arrow/csharp/.gitattributes @@ -0,0 +1,36 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary
\ No newline at end of file |