Add GIT_EMERGECONFLICT and GIT_EDIRECTORY error mapping

libgit2 · Oct 23, 2015 · 14ccd34 · 14ccd34
1 parent 78cad1d
commit 14ccd34
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/LibGit2Sharp/Core/GitErrorCode.cs b/LibGit2Sharp/Core/GitErrorCode.cs
@@ -106,6 +106,16 @@ internal enum GitErrorCode
         /// </summary>
         Uncommitted = -22,
 
+        /// <summary>
+        /// The operation is not valid for a directory.
+        /// </summary>
+        Directory = -23,
+
+        /// <summary>
+        /// A merge conflict exists and cannot continue
+        /// </summary>
+        MergeConflict = -24,
+
         /// <summary>
         /// Skip and passthrough the given ODB backend.
         /// </summary>