relfilenode statistics

Applying: Split PgStat_StatTabEntry into separate table and index structures
Using index info to reconstruct a base tree...
M	doc/src/sgml/monitoring.sgml
M	src/backend/catalog/system_views.sql
M	src/backend/utils/activity/Makefile
M	src/backend/utils/activity/meson.build
M	src/backend/utils/activity/pgstat.c
M	src/backend/utils/activity/pgstat_relation.c
M	src/backend/utils/adt/pgstatfuncs.c
M	src/include/catalog/pg_proc.dat
M	src/include/pgstat.h
M	src/include/utils/pgstat_internal.h
M	src/include/utils/pgstat_kind.h
M	src/test/regress/expected/rules.out
M	src/test/regress/expected/stats.out
M	src/test/regress/sql/stats.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/stats.out
Auto-merging src/test/regress/expected/rules.out
Auto-merging src/include/utils/pgstat_internal.h
Auto-merging src/include/pgstat.h
CONFLICT (content): Merge conflict in src/include/pgstat.h
Auto-merging src/include/catalog/pg_proc.dat
CONFLICT (content): Merge conflict in src/include/catalog/pg_proc.dat
Auto-merging src/backend/utils/adt/pgstatfuncs.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/pgstatfuncs.c
Auto-merging src/backend/utils/activity/pgstat_relation.c
CONFLICT (content): Merge conflict in src/backend/utils/activity/pgstat_relation.c
CONFLICT (add/add): Merge conflict in src/backend/utils/activity/pgstat_index.c
Auto-merging src/backend/utils/activity/pgstat_index.c
Auto-merging src/backend/utils/activity/pgstat.c
CONFLICT (content): Merge conflict in src/backend/utils/activity/pgstat.c
Auto-merging src/backend/catalog/system_views.sql
Auto-merging doc/src/sgml/monitoring.sgml
Patch failed at 0001 Split PgStat_StatTabEntry into separate table and index structures

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"