recovery modules

Applying: refactor code for restoring via shell
Using index info to reconstruct a base tree...
M	src/backend/Makefile
M	src/backend/access/transam/timeline.c
M	src/backend/access/transam/xlog.c
M	src/backend/access/transam/xlogarchive.c
M	src/backend/access/transam/xlogrecovery.c
M	src/backend/meson.build
M	src/backend/postmaster/startup.c
M	src/include/Makefile
M	src/include/access/xlogarchive.h
M	src/include/meson.build
M	src/include/postmaster/startup.h
M	src/tools/pgindent/typedefs.list
Falling back to patching base and 3-way merge...
Auto-merging src/tools/pgindent/typedefs.list
CONFLICT (content): Merge conflict in src/tools/pgindent/typedefs.list
Auto-merging src/include/postmaster/startup.h
CONFLICT (content): Merge conflict in src/include/postmaster/startup.h
Auto-merging src/include/meson.build
Auto-merging src/include/access/xlogarchive.h
Auto-merging src/include/Makefile
CONFLICT (content): Merge conflict in src/include/Makefile
Auto-merging src/backend/postmaster/startup.c
Auto-merging src/backend/meson.build
Auto-merging src/backend/access/transam/xlogrecovery.c
Auto-merging src/backend/access/transam/xlogarchive.c
Auto-merging src/backend/access/transam/xlog.c
Auto-merging src/backend/access/transam/timeline.c
Auto-merging src/backend/Makefile
CONFLICT (content): Merge conflict in src/backend/Makefile
Patch failed at 0001 refactor code for restoring via shell

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"