From 3aa096cce812ca28fcc10b0b8bd5bd8486f54508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
Date: Tue, 5 Jun 2018 19:57:09 +0200
Subject: [PATCH] Fix argument handling in Git.Merge.trees

This change makes ancestor_tree and opts optional to match the
documentation.

Closes: https://github.com/nodegit/nodegit/issues/1504
---
 generate/input/descriptor.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
index d309a5fd9..c26606680 100644
--- a/generate/input/descriptor.json
+++ b/generate/input/descriptor.json
@@ -1572,6 +1572,16 @@
             }
           }
         },
+        "git_merge_trees": {
+          "args": {
+            "ancestor_tree": {
+              "isOptional": true
+            },
+            "opts": {
+              "isOptional": true
+            }
+          }
+        },
         "git_merge_file": {
           "ignore": true
         },