Allow table AMs to define their own reloptions

Applying: Add amoptions callback to table access methods
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/alter_table.sgml
M	src/backend/access/common/reloptions.c
M	src/backend/catalog/index.c
M	src/backend/commands/tablecmds.c
M	src/backend/commands/vacuum.c
M	src/backend/utils/cache/relcache.c
M	src/include/access/tableam.h
M	src/include/utils/rel.h
M	src/test/modules/Makefile
M	src/test/modules/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/meson.build
Auto-merging src/test/modules/Makefile
Auto-merging src/include/utils/rel.h
Auto-merging src/include/access/tableam.h
Auto-merging src/backend/utils/cache/relcache.c
Auto-merging src/backend/commands/vacuum.c
CONFLICT (content): Merge conflict in src/backend/commands/vacuum.c
Auto-merging src/backend/commands/tablecmds.c
Auto-merging src/backend/catalog/index.c
Auto-merging src/backend/access/common/reloptions.c
Auto-merging doc/src/sgml/ref/alter_table.sgml
Patch failed at 0001 Add amoptions callback to table access methods

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"

Applying: Add amoptions callback to table access methods
Using index info to reconstruct a base tree...
M	src/backend/access/common/reloptions.c
M	src/backend/catalog/index.c
M	src/backend/commands/tablecmds.c
M	src/backend/commands/vacuum.c
M	src/backend/utils/cache/relcache.c
M	src/include/access/tableam.h
M	src/include/utils/rel.h
M	src/test/modules/Makefile
M	src/test/modules/meson.build
M	src/tools/pgindent/typedefs.list
Falling back to patching base and 3-way merge...
Auto-merging src/tools/pgindent/typedefs.list
Auto-merging src/test/modules/meson.build
Auto-merging src/test/modules/Makefile
Auto-merging src/include/utils/rel.h
Auto-merging src/include/access/tableam.h
Auto-merging src/backend/utils/cache/relcache.c
Auto-merging src/backend/commands/vacuum.c
CONFLICT (content): Merge conflict in src/backend/commands/vacuum.c
Auto-merging src/backend/commands/tablecmds.c
Auto-merging src/backend/catalog/index.c
Auto-merging src/backend/access/common/reloptions.c
Patch failed at 0001 Add amoptions callback to table access methods

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"