From cc1d657f7ec4167eba3f5e20d75902c9a8396382 Mon Sep 17 00:00:00 2001
From: Raphael Medaer <rme@escaux.com>
Date: Tue, 28 Jun 2016 11:48:27 +0200
Subject: [PATCH] Set parameter 'ancestor_tree' as optional in 'Merge.trees'
 method.

---
 generate/input/descriptor.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
index 677029ff3e..46698be9d0 100644
--- a/generate/input/descriptor.json
+++ b/generate/input/descriptor.json
@@ -1270,6 +1270,13 @@
             }
           }
         },
+        "git_merge_trees": {
+          "args": {
+            "ancestor_tree": {
+              "isOptional": true
+            }
+          }
+        },
         "git_merge_file": {
           "ignore": true
         },