Pre-proposal: unicode normalized text

Applying: CREATE DATABASE ... STRICT_UNICODE.
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/alter_database.sgml
M	doc/src/sgml/ref/create_database.sgml
M	doc/src/sgml/ref/createdb.sgml
M	doc/src/sgml/ref/initdb.sgml
M	src/backend/commands/dbcommands.c
M	src/backend/utils/adt/oracle_compat.c
M	src/backend/utils/adt/pg_locale.c
M	src/backend/utils/adt/varlena.c
M	src/backend/utils/init/postinit.c
M	src/bin/initdb/initdb.c
M	src/bin/pg_dump/pg_dump.c
M	src/bin/psql/describe.c
M	src/bin/scripts/createdb.c
M	src/include/catalog/pg_database.dat
M	src/include/catalog/pg_database.h
M	src/include/utils/pg_locale.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/utils/pg_locale.h
CONFLICT (content): Merge conflict in src/include/utils/pg_locale.h
Auto-merging src/include/catalog/pg_database.h
Auto-merging src/include/catalog/pg_database.dat
Auto-merging src/bin/scripts/createdb.c
CONFLICT (content): Merge conflict in src/bin/scripts/createdb.c
Auto-merging src/bin/psql/describe.c
Auto-merging src/bin/pg_dump/pg_dump.c
Auto-merging src/bin/initdb/initdb.c
CONFLICT (content): Merge conflict in src/bin/initdb/initdb.c
Auto-merging src/backend/utils/init/postinit.c
Auto-merging src/backend/utils/adt/varlena.c
Auto-merging src/backend/utils/adt/pg_locale.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/pg_locale.c
Auto-merging src/backend/utils/adt/oracle_compat.c
Auto-merging src/backend/commands/dbcommands.c
CONFLICT (content): Merge conflict in src/backend/commands/dbcommands.c
Auto-merging doc/src/sgml/ref/initdb.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/ref/initdb.sgml
Auto-merging doc/src/sgml/ref/createdb.sgml
Auto-merging doc/src/sgml/ref/create_database.sgml
Auto-merging doc/src/sgml/ref/alter_database.sgml
Patch failed at 0001 CREATE DATABASE ... STRICT_UNICODE.

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"