REPACK enhancements

Applying: Make REPACK (CONCURRENTLY) MVCC-safe.
Using index info to reconstruct a base tree...
M	src/backend/access/heap/heapam.c
M	src/backend/access/heap/rewriteheap.c
M	src/backend/access/transam/xlogrecovery.c
M	src/backend/commands/repack.c
M	src/backend/commands/tablecmds.c
M	src/backend/executor/nodeModifyTable.c
M	src/backend/replication/logical/reorderbuffer.c
M	src/backend/utils/activity/wait_event_names.txt
M	src/include/access/xlog_internal.h
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/activity/wait_event_names.txt
Auto-merging src/backend/replication/logical/reorderbuffer.c
Auto-merging src/backend/executor/nodeModifyTable.c
Auto-merging src/backend/commands/tablecmds.c
Auto-merging src/backend/commands/repack.c
Auto-merging src/backend/access/transam/xlogrecovery.c
Auto-merging src/backend/access/heap/rewriteheap.c
Auto-merging src/backend/access/heap/heapam.c
CONFLICT (content): Merge conflict in src/backend/access/heap/heapam.c
Patch failed at 0001 Make REPACK (CONCURRENTLY) MVCC-safe.

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"