Should we add xid_current() or a int8->xid cast?

Applying: Rename xid to xid4.
Using index info to reconstruct a base tree...
M	src/backend/access/hash/hashvalidate.c
M	src/backend/access/transam/commit_ts.c
M	src/backend/access/transam/multixact.c
M	src/backend/access/transam/twophase.c
M	src/backend/bootstrap/bootstrap.c
M	src/backend/catalog/Catalog.pm
M	src/backend/catalog/genbki.pl
M	src/backend/catalog/heap.c
M	src/backend/catalog/system_views.sql
M	src/backend/utils/adt/lockfuncs.c
M	src/backend/utils/adt/xid.c
M	src/backend/utils/misc/pg_controldata.c
M	src/fe_utils/print.c
M	src/include/catalog/pg_amop.dat
M	src/include/catalog/pg_amproc.dat
M	src/include/catalog/pg_cast.dat
M	src/include/catalog/pg_opclass.dat
M	src/include/catalog/pg_operator.dat
M	src/include/catalog/pg_opfamily.dat
M	src/include/catalog/pg_proc.dat
M	src/include/catalog/pg_type.dat
M	src/interfaces/ecpg/ecpglib/execute.c
M	src/test/regress/expected/alter_table.out
M	src/test/regress/expected/groupingsets.out
M	src/test/regress/expected/opr_sanity.out
M	src/test/regress/expected/update.out
M	src/test/regress/expected/xid.out
M	src/test/regress/sql/alter_table.sql
M	src/test/regress/sql/groupingsets.sql
M	src/test/regress/sql/update.sql
M	src/test/regress/sql/xid.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/xid.sql
CONFLICT (content): Merge conflict in src/test/regress/sql/xid.sql
Auto-merging src/test/regress/sql/update.sql
Auto-merging src/test/regress/sql/groupingsets.sql
Auto-merging src/test/regress/sql/alter_table.sql
Auto-merging src/test/regress/expected/xid.out
CONFLICT (content): Merge conflict in src/test/regress/expected/xid.out
Auto-merging src/test/regress/expected/update.out
Auto-merging src/test/regress/expected/opr_sanity.out
Auto-merging src/test/regress/expected/groupingsets.out
Auto-merging src/test/regress/expected/alter_table.out
Auto-merging src/interfaces/ecpg/ecpglib/execute.c
Auto-merging src/include/catalog/pg_type.dat
Auto-merging src/include/catalog/pg_proc.dat
CONFLICT (content): Merge conflict in src/include/catalog/pg_proc.dat
Auto-merging src/include/catalog/pg_opfamily.dat
CONFLICT (content): Merge conflict in src/include/catalog/pg_opfamily.dat
Auto-merging src/include/catalog/pg_operator.dat
Auto-merging src/include/catalog/pg_opclass.dat
Auto-merging src/include/catalog/pg_cast.dat
Auto-merging src/include/catalog/pg_amproc.dat
CONFLICT (content): Merge conflict in src/include/catalog/pg_amproc.dat
Auto-merging src/include/catalog/pg_amop.dat
Auto-merging src/fe_utils/print.c
CONFLICT (content): Merge conflict in src/fe_utils/print.c
Auto-merging src/backend/utils/misc/pg_controldata.c
CONFLICT (content): Merge conflict in src/backend/utils/misc/pg_controldata.c
Auto-merging src/backend/utils/adt/xid.c
Auto-merging src/backend/utils/adt/lockfuncs.c
Auto-merging src/backend/catalog/system_views.sql
CONFLICT (content): Merge conflict in src/backend/catalog/system_views.sql
Auto-merging src/backend/catalog/heap.c
Auto-merging src/backend/catalog/genbki.pl
CONFLICT (content): Merge conflict in src/backend/catalog/genbki.pl
Auto-merging src/backend/catalog/Catalog.pm
CONFLICT (content): Merge conflict in src/backend/catalog/Catalog.pm
Auto-merging src/backend/bootstrap/bootstrap.c
CONFLICT (content): Merge conflict in src/backend/bootstrap/bootstrap.c
Auto-merging src/backend/access/transam/twophase.c
Auto-merging src/backend/access/transam/multixact.c
CONFLICT (content): Merge conflict in src/backend/access/transam/multixact.c
Auto-merging src/backend/access/transam/commit_ts.c
CONFLICT (content): Merge conflict in src/backend/access/transam/commit_ts.c
Auto-merging src/backend/access/hash/hashvalidate.c
CONFLICT (content): Merge conflict in src/backend/access/hash/hashvalidate.c
Patch failed at 0001 Rename xid to xid4.

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"