pg_buffercache: Add per-relation summary stats

Applying: pg_buffercache: Add pg_buffercache_relations() function
Using index info to reconstruct a base tree...
M	contrib/pg_buffercache/expected/pg_buffercache.out
M	contrib/pg_buffercache/pg_buffercache_pages.c
M	contrib/pg_buffercache/sql/pg_buffercache.sql
M	src/tools/pgindent/typedefs.list
Falling back to patching base and 3-way merge...
Auto-merging src/tools/pgindent/typedefs.list
Auto-merging contrib/pg_buffercache/sql/pg_buffercache.sql
CONFLICT (content): Merge conflict in contrib/pg_buffercache/sql/pg_buffercache.sql
Auto-merging contrib/pg_buffercache/pg_buffercache_pages.c
CONFLICT (content): Merge conflict in contrib/pg_buffercache/pg_buffercache_pages.c
Auto-merging contrib/pg_buffercache/expected/pg_buffercache.out
CONFLICT (content): Merge conflict in contrib/pg_buffercache/expected/pg_buffercache.out
Patch failed at 0001 pg_buffercache: Add pg_buffercache_relations() function

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"