Merge pull request #1210 from libgit2/ntk/upgrade

Update libgit2 to 821131f

Author: nulltoken

LibGit2Sharp/ConfigurationLevel.cs

@@ -8,21 +8,21 @@ public enum ConfigurationLevel
         /// <summary>
         /// The local .git/config of the current repository.
         /// </summary>
-        Local = 4,
+        Local = 5,
 
         /// <summary>
         /// The global ~/.gitconfig of the current user.
         /// </summary>
-        Global = 3,
+        Global = 4,
 
         /// <summary>
         /// The global ~/.config/git/config of the current user.
         /// </summary>
-        Xdg = 2,
+        Xdg = 3,
 
         /// <summary>
         /// The system wide .gitconfig.
         /// </summary>
-        System = 1,
+        System = 2,
     }
 }

LibGit2Sharp/Core/GitMergeOpts.cs

@@ -106,9 +106,18 @@ internal enum GitMergeTreeFlags
         GIT_MERGE_TREE_NORMAL = 0,
 
         /// <summary>
-        /// GIT_MERGE_TREE_FIND_RENAMES in libgit2
+        /// Detect renames that occur between the common ancestor and the "ours"
+     	/// side or the common ancestor and the "theirs" side.  This will enable
+ 	    /// the ability to merge between a modified and renamed file.
         /// </summary>
         GIT_MERGE_TREE_FIND_RENAMES = (1 << 0),
+
+        /// <summary>
+        /// If a conflict occurs, exit immediately instead of attempting to
+        /// continue resolving conflicts.  The merge operation will fail with
+        /// GIT_EMERGECONFLICT and no index will be returned.
+        ///</summary>
+        GIT_MERGE_TREE_FAIL_ON_CONFLICT = (1 << 1),
     }
 
     [Flags]

LibGit2Sharp/LibGit2Sharp.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.86\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.86\build\LibGit2Sharp.NativeBinaries.props')" />
+  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.106\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.106\build\LibGit2Sharp.NativeBinaries.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -405,7 +405,7 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.86\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.86\build\LibGit2Sharp.NativeBinaries.props'))" />
+    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.106\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.106\build\LibGit2Sharp.NativeBinaries.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

LibGit2Sharp/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LibGit2Sharp.NativeBinaries" version="1.0.86" targetFramework="net40" allowedVersions="[1.0.86]" />
+  <package id="LibGit2Sharp.NativeBinaries" version="1.0.106" targetFramework="net4" allowedVersions="[1.0.106]" />
 </packages>