PATCH: pg_dump to support "on conflict do update"

Applying: pg_dump to support 'on conflict update'
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/pg_dump.sgml
M	src/bin/pg_dump/pg_dump.c
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_dump/pg_dump.c
CONFLICT (content): Merge conflict in src/bin/pg_dump/pg_dump.c
Auto-merging doc/src/sgml/ref/pg_dump.sgml
Patch failed at 0001 pg_dump to support 'on conflict update'

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"