Fix argument handling in Git.Merge.trees

tniessen · tniessen · commit 3aa096cce812 · 2018-06-05T19:57:09.000+02:00
This change makes ancestor_tree and opts optional to match the documentation. Closes: #1504
diff --git 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
         },
