deparsing utility commands

Applying: ddl_deparse core support
Using index info to reconstruct a base tree...
M	src/backend/catalog/objectaddress.c
M	src/backend/commands/seclabel.c
M	src/backend/commands/sequence.c
M	src/backend/utils/adt/format_type.c
M	src/backend/utils/adt/regproc.c
M	src/backend/utils/adt/ruleutils.c
M	src/include/commands/sequence.h
M	src/include/utils/builtins.h
M	src/include/utils/regproc.h
M	src/include/utils/ruleutils.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/utils/ruleutils.h
CONFLICT (content): Merge conflict in src/include/utils/ruleutils.h
Auto-merging src/include/utils/regproc.h
CONFLICT (content): Merge conflict in src/include/utils/regproc.h
Auto-merging src/include/utils/builtins.h
Auto-merging src/include/commands/sequence.h
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/regproc.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/regproc.c
Auto-merging src/backend/utils/adt/format_type.c
Auto-merging src/backend/commands/sequence.c
Auto-merging src/backend/commands/seclabel.c
Auto-merging src/backend/catalog/objectaddress.c
Patch failed at 0001 ddl_deparse core support

/ci/repo/worktrees/worktree/rebase-apply/patch:341: space before tab in indent.
		 	 * Would this proc be found (given the right args) by regprocedurein?
/ci/repo/worktrees/worktree/rebase-apply/patch:342: space before tab in indent.
		 	 * If not, or if caller requests it, we need to qualify it.
/ci/repo/worktrees/worktree/rebase-apply/patch:343: space before tab in indent.
		 	 */
/ci/repo/worktrees/worktree/rebase-apply/patch:1010: indent with spaces.
                    Oid *nspid, char **typname,
/ci/repo/worktrees/worktree/rebase-apply/patch:1011: indent with spaces.
                    char **typemodstr, bool *is_array);
warning: squelched 8 whitespace errors
warning: 13 lines add whitespace errors.
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"