Intermittent pg_ctl failures on Windows

Applying: Avoid share locks on log_file between old and new cmd.exe when the server restarts. pg_ctl now opens the postmaster.pid file using pgwin32_open() function to correctly handle share locks. On Windows systems we cannot handle ERROR_DELETE_PENDING because GetLastError() returns ERROR_ACCESS_DENIED instead. So we rename the lock files before delete them. Discussion: https://www.postgresql.org/message-id/flat/16922.1520722108%40sss.pgh.pa.us
Using index info to reconstruct a base tree...
M	src/backend/utils/init/miscinit.c
M	src/bin/pg_ctl/pg_ctl.c
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_ctl/pg_ctl.c
CONFLICT (content): Merge conflict in src/bin/pg_ctl/pg_ctl.c
Auto-merging src/backend/utils/init/miscinit.c
Patch failed at 0001 Avoid share locks on log_file between old and new cmd.exe when the server restarts. pg_ctl now opens the postmaster.pid file using pgwin32_open() function to correctly handle share locks. On Windows systems we cannot handle ERROR_DELETE_PENDING because GetLastError() returns ERROR_ACCESS_DENIED instead. So we rename the lock files before delete them. Discussion: https://www.postgresql.org/message-id/flat/16922.1520722108%40sss.pgh.pa.us

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"