alert clients when prepared statements are deallocated

Applying: Alert client when prepared statements are deallocated.
Using index info to reconstruct a base tree...
M	doc/src/sgml/libpq.sgml
M	doc/src/sgml/protocol.sgml
M	src/backend/tcop/backend_startup.c
M	src/bin/pg_upgrade/server.c
M	src/bin/pg_upgrade/version.c
M	src/include/libpq/protocol.h
M	src/interfaces/libpq/fe-connect.c
M	src/interfaces/libpq/fe-protocol3.c
M	src/interfaces/libpq/fe-trace.c
M	src/interfaces/libpq/libpq-fe.h
M	src/interfaces/libpq/libpq-int.h
Falling back to patching base and 3-way merge...
Auto-merging src/interfaces/libpq/libpq-int.h
Auto-merging src/interfaces/libpq/libpq-fe.h
Auto-merging src/interfaces/libpq/fe-trace.c
Auto-merging src/interfaces/libpq/fe-protocol3.c
CONFLICT (content): Merge conflict in src/interfaces/libpq/fe-protocol3.c
Auto-merging src/interfaces/libpq/fe-connect.c
Auto-merging src/include/libpq/protocol.h
Auto-merging src/bin/pg_upgrade/version.c
Auto-merging src/bin/pg_upgrade/server.c
Auto-merging src/backend/tcop/backend_startup.c
Auto-merging doc/src/sgml/protocol.sgml
Auto-merging doc/src/sgml/libpq.sgml
Patch failed at 0001 Alert client when prepared statements are deallocated.

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"