Tracking role modification timestamps in pg_authid / pg_roles

Applying: Track last-modification timestamp for roles, databases, tablespaces
Using index info to reconstruct a base tree...
M	doc/src/sgml/catalogs.sgml
M	doc/src/sgml/system-views.sgml
M	src/backend/catalog/system_views.sql
M	src/backend/commands/alter.c
M	src/backend/commands/tablespace.c
M	src/include/catalog/catversion.h
M	src/include/catalog/pg_database.h
M	src/include/catalog/pg_tablespace.h
M	src/test/regress/expected/rules.out
M	src/test/regress/parallel_schedule
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/parallel_schedule
CONFLICT (content): Merge conflict in src/test/regress/parallel_schedule
Auto-merging src/test/regress/expected/rules.out
Auto-merging src/include/catalog/pg_tablespace.h
CONFLICT (content): Merge conflict in src/include/catalog/pg_tablespace.h
Auto-merging src/include/catalog/pg_database.h
CONFLICT (content): Merge conflict in src/include/catalog/pg_database.h
Auto-merging src/include/catalog/catversion.h
CONFLICT (content): Merge conflict in src/include/catalog/catversion.h
Auto-merging src/backend/commands/tablespace.c
Auto-merging src/backend/commands/alter.c
Auto-merging src/backend/catalog/system_views.sql
Auto-merging doc/src/sgml/system-views.sgml
Auto-merging doc/src/sgml/catalogs.sgml
Patch failed at 0001 Track last-modification timestamp for roles, databases, tablespaces

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"