=== Applying patches on top of PostgreSQL commit ID 66ad764c8d517f59577d41ac3dad786729c9e10e ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Apr 14 19:41:25 UTC 2026
On branch cf/6258
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-psql-add-size-based-sorting-for-tables-and-indexes.patch ===
Applying: psql: add size-based sorting options (O/o) for tables and indexes
Using index info to reconstruct a base tree...
M	src/bin/psql/describe.c
M	src/bin/psql/help.c
Falling back to patching base and 3-way merge...
Auto-merging src/bin/psql/help.c
CONFLICT (content): Merge conflict in src/bin/psql/help.c
Auto-merging src/bin/psql/describe.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 psql: add size-based sorting options (O/o) for tables and indexes
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 ./v1-0001-psql-add-size-based-sorting-for-tables-and-indexes.patch ===
patching file src/bin/psql/describe.c
Hunk #1 succeeded at 4396 (offset 202 lines).
patching file src/bin/psql/help.c
Hunk #1 FAILED at 246.
Hunk #2 succeeded at 263 (offset 1 line).
1 out of 2 hunks FAILED -- saving rejects to file src/bin/psql/help.c.rej
Unstaged changes after reset:
M	src/bin/psql/describe.c
M	src/bin/psql/help.c
Removing src/bin/psql/help.c.rej
=== using 'git apply' to apply patch ./v1-0001-psql-add-size-based-sorting-for-tables-and-indexes.patch ===
Applied patch to 'src/bin/psql/describe.c' cleanly.
Applied patch to 'src/bin/psql/help.c' with conflicts.
U src/bin/psql/help.c
diff --cc src/bin/psql/help.c
index 5e0d8f3aae1,f58b66b2aa0..00000000000
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@@ -246,8 -246,7 +246,12 @@@ slashUsage(unsigned short int pager
  	HELP0("  \\dFp[x+] [PATTERN]     list text search parsers\n");
  	HELP0("  \\dFt[x+] [PATTERN]     list text search templates\n");
  	HELP0("  \\dg[Sx+] [PATTERN]     list roles\n");
++<<<<<<< ours
 +	HELP0("  \\dG[Sx+] [PATTERN]     list property graphs\n");
 +	HELP0("  \\di[Sx+] [PATTERN]     list indexes\n");
++=======
+ 	HELP0("  \\di[OoSx+] [PATTERN]   list indexes\n");
++>>>>>>> theirs
  	HELP0("  \\dl[x+]                list large objects, same as \\lo_list\n");
  	HELP0("  \\dL[Sx+] [PATTERN]     list procedural languages\n");
  	HELP0("  \\dm[Sx+] [PATTERN]     list materialized views\n");