Adding facility for injection points (or probe points?) for more advanced tests

Applying: Extend injection points with optional runtime arguments
Using index info to reconstruct a base tree...
M	doc/src/sgml/xfunc.sgml
M	src/backend/utils/misc/injection_point.c
M	src/include/utils/injection_point.h
M	src/test/modules/injection_points/expected/injection_points.out
M	src/test/modules/injection_points/injection_points--1.0.sql
M	src/test/modules/injection_points/injection_points.c
M	src/test/modules/injection_points/sql/injection_points.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/injection_points/sql/injection_points.sql
Auto-merging src/test/modules/injection_points/injection_points.c
CONFLICT (content): Merge conflict in src/test/modules/injection_points/injection_points.c
Auto-merging src/test/modules/injection_points/injection_points--1.0.sql
Auto-merging src/test/modules/injection_points/expected/injection_points.out
CONFLICT (content): Merge conflict in src/test/modules/injection_points/expected/injection_points.out
Auto-merging src/include/utils/injection_point.h
CONFLICT (content): Merge conflict in src/include/utils/injection_point.h
Auto-merging src/backend/utils/misc/injection_point.c
CONFLICT (content): Merge conflict in src/backend/utils/misc/injection_point.c
Auto-merging doc/src/sgml/xfunc.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/xfunc.sgml
Patch failed at 0001 Extend injection points with optional runtime arguments

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"