=== Applying patches on top of PostgreSQL commit ID 484b3e1d83eefffa3953ff6bfea72dbe547916b5 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Sep 18 21:42:32 UTC 2026
On branch cf/7318
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Improvements-to-psql-single-step-mode.patch ===
Applying: Improvements to psql --single-step mode
Using index info to reconstruct a base tree...
M	src/bin/psql/common.c
M	src/bin/psql/mainloop.c
M	src/bin/psql/tab-complete.in.c
M	src/tools/pgindent/typedefs.list
Falling back to patching base and 3-way merge...
Auto-merging src/tools/pgindent/typedefs.list
Auto-merging src/bin/psql/tab-complete.in.c
Auto-merging src/bin/psql/mainloop.c
Auto-merging src/bin/psql/common.c
CONFLICT (content): Merge conflict in src/bin/psql/common.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Improvements to psql --single-step mode
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
=== using patch(1) to apply patch ./0001-Improvements-to-psql-single-step-mode.patch ===
patching file src/bin/psql/common.c
Hunk #1 FAILED at 27.
Hunk #2 succeeded at 1108 (offset 4 lines).
Hunk #3 succeeded at 1254 (offset 8 lines).
Hunk #4 succeeded at 1406 (offset 12 lines).
1 out of 4 hunks FAILED -- saving rejects to file src/bin/psql/common.c.rej
patching file src/bin/psql/input.c
patching file src/bin/psql/input.h
patching file src/bin/psql/mainloop.c
patching file src/bin/psql/tab-complete.h
patching file src/bin/psql/tab-complete.in.c
Hunk #2 succeeded at 1461 (offset -8 lines).
Hunk #3 succeeded at 1854 (offset -8 lines).
Hunk #4 succeeded at 2141 (offset -8 lines).
patching file src/tools/pgindent/typedefs.list
Hunk #1 succeeded at 4339 (offset -13 lines).
Unstaged changes after reset:
M	src/bin/psql/common.c
M	src/bin/psql/input.c
M	src/bin/psql/input.h
M	src/bin/psql/mainloop.c
M	src/bin/psql/tab-complete.h
M	src/bin/psql/tab-complete.in.c
M	src/tools/pgindent/typedefs.list
Removing src/bin/psql/common.c.rej
=== using 'git apply' to apply patch ./0001-Improvements-to-psql-single-step-mode.patch ===
Applied patch to 'src/bin/psql/common.c' with conflicts.
Applied patch to 'src/bin/psql/input.c' cleanly.
Applied patch to 'src/bin/psql/input.h' cleanly.
Applied patch to 'src/bin/psql/mainloop.c' cleanly.
Applied patch to 'src/bin/psql/tab-complete.h' cleanly.
Applied patch to 'src/bin/psql/tab-complete.in.c' cleanly.
Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.
U src/bin/psql/common.c
diff --cc src/bin/psql/common.c
index f220344daaf,35ace448a61..00000000000
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@@ -27,9 -27,10 +27,14 @@@
  #include "fe_utils/cancel.h"
  #include "fe_utils/mbprint.h"
  #include "fe_utils/string_utils.h"
++<<<<<<< ours
 +#include "mainloop.h"
++=======
+ #include "input.h"
++>>>>>>> theirs
  #include "portability/instr_time.h"
  #include "settings.h"
+ #include "tab-complete.h"
  
  static bool DescribeQuery(const char *query, double *elapsed_msec);
  static int	ExecQueryAndProcessResults(const char *query,