Unlogged materialized views

Applying: Replace pg_class.relispopulated with epoch-capable relpopulated
Using index info to reconstruct a base tree...
M	doc/src/sgml/catalogs.sgml
M	doc/src/sgml/func/func-info.sgml
M	src/backend/catalog/system_views.sql
M	src/backend/commands/copyto.c
M	src/backend/commands/repack.c
M	src/backend/utils/cache/relcache.c
M	src/bin/pg_dump/pg_dump.c
M	src/include/catalog/catversion.h
M	src/include/catalog/pg_proc.dat
M	src/include/utils/rel.h
M	src/test/regress/expected/rules.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/rules.out
Auto-merging src/include/utils/rel.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/bin/pg_dump/pg_dump.c
CONFLICT (content): Merge conflict in src/bin/pg_dump/pg_dump.c
Auto-merging src/backend/utils/cache/relcache.c
Auto-merging src/backend/commands/repack.c
Auto-merging src/backend/commands/copyto.c
Auto-merging src/backend/catalog/system_views.sql
Auto-merging doc/src/sgml/func/func-info.sgml
Auto-merging doc/src/sgml/catalogs.sgml
Patch failed at 0001 Replace pg_class.relispopulated with epoch-capable relpopulated

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"