=== Applying patches on top of PostgreSQL commit ID b0fb2c6aa5a485e28210e13ae5536c1231b1261f ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Sep 28 20:07:19 UTC 2025
On branch cf/5963
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-0001-psql-Improve-tab-completion-for-large-object.patch ===
Applying: psql: Improve tab completion for large object.
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: Improve tab completion for large object.
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".
Unstaged changes after reset:
M	src/bin/psql/tab-complete.in.c
=== using patch(1) to apply patch ./v2-0001-psql-Improve-tab-completion-for-large-object.patch ===
patching file src/bin/psql/tab-complete.in.c
Hunk #1 succeeded at 4552 (offset 10 lines).
Hunk #2 succeeded at 4568 (offset 10 lines).
Hunk #3 FAILED at 5526.
1 out of 3 hunks FAILED -- saving rejects to file src/bin/psql/tab-complete.in.c.rej
Unstaged changes after reset:
M	src/bin/psql/tab-complete.in.c
Removing src/bin/psql/tab-complete.in.c.rej
=== using 'git apply' to apply patch ./v2-0001-psql-Improve-tab-completion-for-large-object.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 6176741d20b,897773434b6..00000000000
--- a/src/bin/psql/tab-complete.in.c
+++ b/src/bin/psql/tab-complete.in.c
@@@ -5530,8 -5526,13 +5536,18 @@@ match_previous_words(int pattern_id
  		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_views);
  	else if (TailMatchesCS("\\cd|\\e|\\edit|\\g|\\gx|\\i|\\include|"
  						   "\\ir|\\include_relative|\\o|\\out|"
++<<<<<<< ours
 +						   "\\s|\\w|\\write|\\lo_import"))
 +		COMPLETE_WITH_FILES("\\", false);
++=======
+ 						   "\\s|\\w|\\write|\\lo_import") ||
+ 			 TailMatchesCS("\\lo_export", MatchAny))
+ 	{
+ 		completion_charp = "\\";
+ 		completion_force_quote = false;
+ 		matches = rl_completion_matches(text, complete_from_files);
+ 	}
++>>>>>>> theirs
  
  	/* gen_tabcomplete.pl ends special processing here */
  	/* END GEN_TABCOMPLETE */