[PATCH] pg_get_domain_ddl: DDL reconstruction function for CREATE DOMAIN statement

Applying: Add pg_get_domain_ddl() function to reconstruct CREATE DOMAIN statements
Using index info to reconstruct a base tree...
M	doc/src/sgml/func/func-info.sgml
M	src/backend/utils/adt/ruleutils.c
M	src/include/catalog/pg_proc.dat
A	src/test/regress/expected/create_property_graph.out
M	src/test/regress/expected/create_schema.out
M	src/test/regress/expected/event_trigger.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/event_trigger.out
Auto-merging src/test/regress/expected/create_schema.out
CONFLICT (content): Merge conflict in src/test/regress/expected/create_schema.out
CONFLICT (modify/delete): src/test/regress/expected/create_property_graph.out deleted in HEAD and modified in Add pg_get_domain_ddl() function to reconstruct CREATE DOMAIN statements. Version Add pg_get_domain_ddl() function to reconstruct CREATE DOMAIN statements of src/test/regress/expected/create_property_graph.out left in tree.
Auto-merging src/include/catalog/pg_proc.dat
Auto-merging src/backend/utils/adt/ruleutils.c
Auto-merging doc/src/sgml/func/func-info.sgml
Patch failed at 0001 Add pg_get_domain_ddl() function to reconstruct CREATE DOMAIN statements

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"