Local partitioned indexes and pageinspect

Applying: Fix gaps in modules with handling of partitioned indexes
Using index info to reconstruct a base tree...
M	contrib/amcheck/expected/check_btree.out
M	contrib/amcheck/sql/check_btree.sql
M	contrib/pageinspect/expected/btree.out
M	contrib/pageinspect/sql/btree.sql
M	contrib/pg_visibility/expected/pg_visibility.out
M	contrib/pg_visibility/sql/pg_visibility.sql
M	contrib/pgstattuple/expected/pgstattuple.out
M	contrib/pgstattuple/sql/pgstattuple.sql
Falling back to patching base and 3-way merge...
Auto-merging contrib/pgstattuple/sql/pgstattuple.sql
CONFLICT (content): Merge conflict in contrib/pgstattuple/sql/pgstattuple.sql
Auto-merging contrib/pgstattuple/expected/pgstattuple.out
CONFLICT (content): Merge conflict in contrib/pgstattuple/expected/pgstattuple.out
Auto-merging contrib/pg_visibility/sql/pg_visibility.sql
Auto-merging contrib/pg_visibility/expected/pg_visibility.out
CONFLICT (content): Merge conflict in contrib/pg_visibility/expected/pg_visibility.out
Auto-merging contrib/pageinspect/sql/btree.sql
Auto-merging contrib/pageinspect/expected/btree.out
Auto-merging contrib/amcheck/sql/check_btree.sql
CONFLICT (content): Merge conflict in contrib/amcheck/sql/check_btree.sql
Auto-merging contrib/amcheck/expected/check_btree.out
CONFLICT (content): Merge conflict in contrib/amcheck/expected/check_btree.out
Patch failed at 0001 Fix gaps in modules with handling of partitioned indexes

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"