Add contrib module pg_stat_log: cumulative statistics about server log messages

Applying: Add cumulative statistics about server log messages
Using index info to reconstruct a base tree...
M	doc/src/sgml/config.sgml
M	doc/src/sgml/monitoring.sgml
M	src/backend/catalog/system_views.sql
M	src/backend/utils/activity/pgstat.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/catalog/catversion.h
M	src/include/catalog/pg_proc.dat
M	src/include/utils/pgstat_internal.h
M	src/test/regress/expected/rules.out
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/regress/expected/rules.out
Auto-merging src/include/utils/pgstat_internal.h
Auto-merging src/include/catalog/pg_proc.dat
Auto-merging src/include/catalog/catversion.h
CONFLICT (content): Merge conflict in src/include/catalog/catversion.h
Auto-merging src/backend/utils/misc/postgresql.conf.sample
Auto-merging src/backend/utils/misc/guc_parameters.dat
Auto-merging src/backend/utils/activity/pgstat.c
Auto-merging src/backend/catalog/system_views.sql
Auto-merging doc/src/sgml/monitoring.sgml
Auto-merging doc/src/sgml/config.sgml
Patch failed at 0001 Add cumulative statistics about server log messages

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"