=== Applying patches on top of PostgreSQL commit ID 10b6e2a3d66098bf26b236c880bab5b3fafc42bd ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Oct  6 19:08:30 UTC 2026
On branch cf/7399
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2_REL_18_STABLE-0001-Rescind-unsafe-deduplication-suppor.patch ===
Applying: Rescind unsafe deduplication support.
Using index info to reconstruct a base tree...
M	contrib/amcheck/verify_nbtree.c
M	src/backend/utils/adt/datum.c
M	src/backend/utils/adt/varlena.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/adt/varlena.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/varlena.c
Auto-merging src/backend/utils/adt/datum.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/datum.c
Auto-merging contrib/amcheck/verify_nbtree.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 Rescind unsafe deduplication support.
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 ./v2_REL_18_STABLE-0001-Rescind-unsafe-deduplication-suppor.patch ===
patching file src/backend/utils/adt/datum.c
Hunk #2 FAILED at 422.
1 out of 2 hunks FAILED -- saving rejects to file src/backend/utils/adt/datum.c.rej
patching file src/backend/utils/adt/varlena.c
Hunk #1 FAILED at 2655.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/adt/varlena.c.rej
patching file contrib/amcheck/verify_nbtree.c
patching file doc/src/sgml/btree.sgml
Unstaged changes after reset:
M	contrib/amcheck/verify_nbtree.c
M	doc/src/sgml/btree.sgml
M	src/backend/utils/adt/datum.c
Removing src/backend/utils/adt/datum.c.rej
Removing src/backend/utils/adt/varlena.c.rej
=== using 'git apply' to apply patch ./v2_REL_18_STABLE-0001-Rescind-unsafe-deduplication-suppor.patch ===
Applied patch to 'src/backend/utils/adt/datum.c' with conflicts.
Applied patch to 'src/backend/utils/adt/varlena.c' with conflicts.
Applied patch to 'contrib/amcheck/verify_nbtree.c' cleanly.
Applied patch to 'doc/src/sgml/btree.sgml' cleanly.
U src/backend/utils/adt/datum.c
U src/backend/utils/adt/varlena.c
diff --cc src/backend/utils/adt/datum.c
index 1d622e31a83,2e906add921..00000000000
--- a/src/backend/utils/adt/datum.c
+++ b/src/backend/utils/adt/datum.c
@@@ -432,11 -430,9 +430,15 @@@ datum_image_hash(Datum value, bool typB
  Datum
  btequalimage(PG_FUNCTION_ARGS)
  {
++<<<<<<< ours
 +#ifdef NOT_USED
  	Oid			opcintype = PG_GETARG_OID(0);
 +#endif
++=======
++	Oid			opcintype = PG_GETARG_OID(0);
++>>>>>>> theirs
  
- 	PG_RETURN_BOOL(true);
+ 	PG_RETURN_BOOL(opcintype != BPCHAROID);
  }
  
  /*-------------------------------------------------------------------------
diff --cc src/backend/utils/adt/varlena.c
index 6c95fcb24b7,51f6ab0960f..00000000000
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@@ -2310,9 -2663,7 +2314,13 @@@ varstr_abbrev_abort(int memtupcount, So
  Datum
  btvarstrequalimage(PG_FUNCTION_ARGS)
  {
++<<<<<<< ours
 +#ifdef NOT_USED
  	Oid			opcintype = PG_GETARG_OID(0);
 +#endif
++=======
++	Oid			opcintype = PG_GETARG_OID(0);
++>>>>>>> theirs
  	Oid			collid = PG_GET_COLLATION();
  	pg_locale_t locale;