Improve pg_trigger.tgargs representation

Applying: Improve pg_trigger.tgargs representation
Using index info to reconstruct a base tree...
M	doc/src/sgml/catalogs.sgml
M	src/backend/catalog/information_schema.sql
M	src/backend/commands/tablecmds.c
M	src/backend/commands/trigger.c
M	src/backend/utils/adt/ruleutils.c
M	src/include/catalog/pg_trigger.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/catalog/pg_trigger.h
Auto-merging src/backend/utils/adt/ruleutils.c
Auto-merging src/backend/commands/trigger.c
CONFLICT (content): Merge conflict in src/backend/commands/trigger.c
Auto-merging src/backend/commands/tablecmds.c
CONFLICT (content): Merge conflict in src/backend/commands/tablecmds.c
Auto-merging src/backend/catalog/information_schema.sql
Auto-merging doc/src/sgml/catalogs.sgml
Patch failed at 0001 Improve pg_trigger.tgargs representation

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"