More tests with USING INDEX replident and dropped indexes

Applying: Reset pg_class.relreplident when associated replica index is dropped
Using index info to reconstruct a base tree...
M	doc/src/sgml/catalogs.sgml
M	src/backend/catalog/index.c
M	src/backend/commands/tablecmds.c
M	src/include/catalog/pg_class.h
M	src/include/commands/tablecmds.h
M	src/test/regress/expected/replica_identity.out
M	src/test/regress/sql/replica_identity.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/replica_identity.sql
CONFLICT (content): Merge conflict in src/test/regress/sql/replica_identity.sql
Auto-merging src/test/regress/expected/replica_identity.out
CONFLICT (content): Merge conflict in src/test/regress/expected/replica_identity.out
Auto-merging src/include/commands/tablecmds.h
CONFLICT (content): Merge conflict in src/include/commands/tablecmds.h
Auto-merging src/include/catalog/pg_class.h
CONFLICT (content): Merge conflict in src/include/catalog/pg_class.h
Auto-merging src/backend/commands/tablecmds.c
CONFLICT (content): Merge conflict in src/backend/commands/tablecmds.c
Auto-merging src/backend/catalog/index.c
Auto-merging doc/src/sgml/catalogs.sgml
Patch failed at 0001 Reset pg_class.relreplident when associated replica index is dropped

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"