| # Licensed to the Apache Software Foundation (ASF) under one |
| # or more contributor license agreements. See the NOTICE file |
| # distributed with this work for additional information |
| # regarding copyright ownership. The ASF licenses this file |
| # to you under the Apache License, Version 2.0 (the |
| # "License"); you may not use this file except in compliance |
| # with the License. You may obtain a copy of the License at |
| # |
| # http://www.apache.org/licenses/LICENSE-2.0 |
| # |
| # Unless required by applicable law or agreed to in writing, |
| # software distributed under the License is distributed on an |
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY |
| # KIND, either express or implied. See the License for the |
| # specific language governing permissions and limitations |
| # under the License. |
| |
| ############################################################################### |
| # 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 |