Cleaning up and speeding up string functions

Applying: Add appendStringInfoStringInfo() function
Using index info to reconstruct a base tree...
M	contrib/hstore/hstore_io.c
M	contrib/postgres_fdw/deparse.c
M	src/backend/access/transam/xlog.c
M	src/backend/executor/execMain.c
A	src/backend/lib/stringinfo.c
M	src/backend/storage/lmgr/deadlock.c
M	src/backend/utils/adt/ri_triggers.c
M	src/backend/utils/adt/ruleutils.c
M	src/backend/utils/adt/xml.c
M	src/include/lib/stringinfo.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/lib/stringinfo.h
Auto-merging src/common/stringinfo.c
Auto-merging src/backend/utils/adt/xml.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/xml.c
Auto-merging src/backend/utils/adt/ruleutils.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/ruleutils.c
Auto-merging src/backend/utils/adt/ri_triggers.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/ri_triggers.c
Auto-merging src/backend/storage/lmgr/deadlock.c
Auto-merging src/backend/executor/execMain.c
Auto-merging src/backend/access/transam/xlog.c
Auto-merging contrib/postgres_fdw/deparse.c
CONFLICT (content): Merge conflict in contrib/postgres_fdw/deparse.c
Auto-merging contrib/hstore/hstore_io.c
CONFLICT (content): Merge conflict in contrib/hstore/hstore_io.c
Patch failed at 0001 Add appendStringInfoStringInfo() function

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"