Add “FOR UPDATE NOWAIT” lock details to the log.

Applying: Make log_lock_failures support LOCK NOWAIT
Using index info to reconstruct a base tree...
M	doc/src/sgml/config.sgml
M	src/backend/catalog/namespace.c
M	src/backend/commands/lockcmds.c
M	src/backend/commands/repack.c
M	src/backend/commands/tablecmds.c
M	src/backend/commands/vacuum.c
M	src/backend/postmaster/autovacuum.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/postmaster/autovacuum.c
Auto-merging src/backend/commands/vacuum.c
Auto-merging src/backend/commands/tablecmds.c
Auto-merging src/backend/commands/repack.c
CONFLICT (content): Merge conflict in src/backend/commands/repack.c
Auto-merging src/backend/commands/lockcmds.c
Auto-merging src/backend/catalog/namespace.c
Auto-merging doc/src/sgml/config.sgml
Patch failed at 0001 Make log_lock_failures support LOCK NOWAIT

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"