Improve the performance of Unicode Normalization Forms.

Applying: Improve the performance of Unicode Normalization Forms
Using index info to reconstruct a base tree...
M	src/common/unicode/Makefile
M	src/common/unicode/meson.build
M	src/common/unicode_norm.c
Falling back to patching base and 3-way merge...
Removing src/include/common/unicode_norm_hashfunc.h
Auto-merging src/common/unicode_norm.c
CONFLICT (content): Merge conflict in src/common/unicode_norm.c
Auto-merging src/common/unicode/meson.build
Auto-merging src/common/unicode/Makefile
CONFLICT (content): Merge conflict in src/common/unicode/Makefile
Patch failed at 0001 Improve the performance of Unicode Normalization Forms

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"