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 },