=== Applying patches on top of PostgreSQL commit ID 15a947f30726cadff695b7601329d90b6703e268 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Oct  9 23:04:23 UTC 2026
On branch cf/7374
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-psql-avoid-CREATE-command-completion-after-GRANT-REV.patch ===
Applying: psql: avoid CREATE command completion after GRANT/REVOKE CREATE
Using index info to reconstruct a base tree...
M	src/bin/psql/tab-complete.in.c
Falling back to patching base and 3-way merge...
Auto-merging src/bin/psql/tab-complete.in.c
CONFLICT (content): Merge conflict in src/bin/psql/tab-complete.in.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: avoid CREATE command completion after GRANT/REVOKE CREATE
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 ./v3-0001-psql-avoid-CREATE-command-completion-after-GRANT-REV.patch ===
patching file src/bin/psql/tab-complete.in.c
Hunk #1 FAILED at 2184.
1 out of 1 hunk FAILED -- saving rejects to file src/bin/psql/tab-complete.in.c.rej
Removing src/bin/psql/tab-complete.in.c.rej
=== using 'git apply' to apply patch ./v3-0001-psql-avoid-CREATE-command-completion-after-GRANT-REV.patch ===
Applied patch to 'src/bin/psql/tab-complete.in.c' with conflicts.
U src/bin/psql/tab-complete.in.c
diff --cc src/bin/psql/tab-complete.in.c
index f86684edc08,035fe488cf4..00000000000
--- a/src/bin/psql/tab-complete.in.c
+++ b/src/bin/psql/tab-complete.in.c
@@@ -2185,11 -2184,10 +2185,18 @@@ match_previous_words(int pattern_id
  	/* BEGIN GEN_TABCOMPLETE */
  
  /* CREATE */
++<<<<<<< ours
 +
 +	/*
 +	 * Complete with something you can create. If CREATE is a privilege name,
 +	 * leave it to the GRANT/REVOKE rules below.
 +	 */
++=======
+ /*
+  * Complete with something you can create. If CREATE is a privilege
+  * name, leave it to the GRANT/REVOKE rules below.
+  */
++>>>>>>> theirs
  	else if (TailMatches("CREATE") &&
  			 !TailMatches("GRANT|REVOKE", "CREATE") &&
  			 !TailMatches("REVOKE", "GRANT", "OPTION", "FOR", "CREATE"))