One more:
[...]
> diff --git a/tests/qapi-schema/alternate-conflict-string.json
> b/tests/qapi-schema/alternate-conflict-string.json
> new file mode 100644
> index 0000000..5fd1a47
> --- /dev/null
> +++ b/tests/qapi-schema/alternate-conflict-string.json
> @@ -0,0 +1,8 @@
> +# FIXME: we should reject anonymous unions with multiple string-like branches
> +{ 'enum': 'Enum',
> + 'data': [ 'hello', 'world' ] }
> +{ 'union': 'MyUnion',
> + 'discriminator': {},
> + 'data': { 'one': 'str',
> + 'two': 'Enum' } }
> +
/home/armbru/work/qemu/.git/rebase-apply/patch:325: new blank line at EOF.
[...]
