PostmasterIsAlive() in recovery (non-USE_POST_MASTER_DEATH_SIGNAL builds)

Applying: Use SIGIO to detect postmaster death.
Using index info to reconstruct a base tree...
M	configure
M	configure.ac
M	src/backend/storage/ipc/pmsignal.c
M	src/include/pg_config.h.in
M	src/include/storage/pmsignal.h
A	src/tools/msvc/Solution.pm
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/tools/msvc/Solution.pm deleted in HEAD and modified in Use SIGIO to detect postmaster death.. Version Use SIGIO to detect postmaster death. of src/tools/msvc/Solution.pm left in tree.
Auto-merging src/include/storage/pmsignal.h
CONFLICT (content): Merge conflict in src/include/storage/pmsignal.h
Auto-merging src/include/pg_config.h.in
CONFLICT (content): Merge conflict in src/include/pg_config.h.in
Auto-merging src/backend/storage/ipc/pmsignal.c
Auto-merging configure.ac
CONFLICT (content): Merge conflict in configure.ac
Auto-merging configure
CONFLICT (content): Merge conflict in configure
Patch failed at 0001 Use SIGIO to detect postmaster death.

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"