[PATCH] Allow complex data for GUC extra.

Applying: Allow complex data for GUC extra data
Using index info to reconstruct a base tree...
M	src/backend/commands/tablespace.c
M	src/backend/postmaster/postmaster.c
M	src/backend/replication/slot.c
M	src/backend/replication/syncrep.c
M	src/backend/utils/misc/guc.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/include/utils/guc.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/utils/guc.h
CONFLICT (content): Merge conflict in src/include/utils/guc.h
Auto-merging src/backend/utils/misc/guc_parameters.dat
Auto-merging src/backend/utils/misc/guc.c
Auto-merging src/backend/replication/syncrep.c
Auto-merging src/backend/replication/slot.c
Auto-merging src/backend/postmaster/postmaster.c
Auto-merging src/backend/commands/tablespace.c
Patch failed at 0001 Allow complex data for GUC extra data

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"