Merge pull request nodegit#997 from nodegit/make-conflict-add-nullable

implausible · implausible · commit 377366cdfcf5 · 2016-04-18T12:29:37.000-07:00
Index.conflictAdd should have nullable entries
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -999,6 +999,20 @@
         },
         "git_index_conflict_add": {
           "isAsync": true,
+          "args": {
+            "index": {
+              "isSelf": true
+            },
+            "ancestor_entry": {
+              "isOptional": true
+            },
+            "our_entry": {
+              "isOptional": true
+            },
+            "their_entry": {
+              "isOptional": true
+            }
+          },
           "return": {
             "isErrorCode": true
           }
