meson: Non-feature feature options

Applying: meson: Make auto the default of the uuid option
Using index info to reconstruct a base tree...
A	.cirrus.yml
M	doc/src/sgml/installation.sgml
M	meson.build
M	meson_options.txt
M	src/makefiles/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/makefiles/meson.build
Auto-merging meson_options.txt
Auto-merging meson.build
CONFLICT (content): Merge conflict in meson.build
Auto-merging doc/src/sgml/installation.sgml
CONFLICT (modify/delete): .cirrus.yml deleted in HEAD and modified in meson: Make auto the default of the uuid option. Version meson: Make auto the default of the uuid option of .cirrus.yml left in tree.
Patch failed at 0001 meson: Make auto the default of the uuid option

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"