=== Applying patches on top of PostgreSQL commit ID e18b0cb7344cb4bd28468f6c0aeeb9b9241d30aa ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jun 10 05:50:24 UTC 2026
On branch cf/5524
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v10-0001-Add-argument-names-to-the-substr-functions.patch ===
Applying: Add argument names to the substr functions
=== using 'git am' to apply patch ./v10-0002-Add-argument-names-to-the-substring-functions.patch ===
Applying: Add argument names to the substring functions
error: sha1 information is lacking or useless (doc/src/sgml/func/func-binarystring.sgml).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add argument names to the substring functions
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 ./v10-0002-Add-argument-names-to-the-substring-functions.patch ===
patching file doc/src/sgml/func/func-binarystring.sgml
patching file doc/src/sgml/func/func-bitstring.sgml
patching file doc/src/sgml/func/func-matching.sgml
Hunk #1 succeeded at 226 (offset -8 lines).
Hunk #2 succeeded at 361 (offset -8 lines).
Hunk #3 FAILED at 581.
1 out of 3 hunks FAILED -- saving rejects to file doc/src/sgml/func/func-matching.sgml.rej
patching file doc/src/sgml/func/func-string.sgml
patching file src/backend/catalog/system_functions.sql
Hunk #1 succeeded at 39 (offset -3 lines).
patching file src/include/catalog/pg_proc.dat
Hunk #1 succeeded at 3774 (offset 26 lines).
Hunk #2 succeeded at 4199 (offset 29 lines).
Hunk #3 succeeded at 4229 (offset 29 lines).
Hunk #4 succeeded at 6362 (offset 56 lines).
Hunk #5 succeeded at 6566 (offset 56 lines).
Unstaged changes after reset:
M	doc/src/sgml/func/func-binarystring.sgml
M	doc/src/sgml/func/func-bitstring.sgml
M	doc/src/sgml/func/func-matching.sgml
M	doc/src/sgml/func/func-string.sgml
M	src/backend/catalog/system_functions.sql
M	src/include/catalog/pg_proc.dat
Removing doc/src/sgml/func/func-matching.sgml.rej
=== using 'git apply' to apply patch ./v10-0002-Add-argument-names-to-the-substring-functions.patch ===
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'doc/src/sgml/func/func-bitstring.sgml' cleanly.
Applied patch to 'doc/src/sgml/func/func-matching.sgml' with conflicts.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/backend/catalog/system_functions.sql' cleanly.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
U doc/src/sgml/func/func-matching.sgml
diff --cc doc/src/sgml/func/func-matching.sgml
index ae1dff66722,fb574bb83cb..00000000000
--- a/doc/src/sgml/func/func-matching.sgml
+++ b/doc/src/sgml/func/func-matching.sgml
@@@ -539,33 -577,20 +539,46 @@@ substring('foobar' SIMILAR '#"o_b#"%' E
  
      <para>
       The <acronym>POSIX</acronym> pattern language is described in much
 -     greater detail below.
 +     greater detail in <xref linkend="posix-syntax-details"/>.
 +    </para>
 +
 +   <sect3 id="functions-posix-list">
 +    <title>POSIX Regular Expression Functions</title>
 +
 +    <para>
 +     This section describes the available functions for pattern matching
 +     using POSIX regular expressions.
      </para>
  
 +   <sect4 id="functions-posix-substring">
 +   <title><function>substring</function></title>
 +   <indexterm>
 +    <primary>substring</primary>
 +   </indexterm>
 +
      <para>
++<<<<<<< ours
 +     The <function>substring</function> function with two parameters
 +     provides extraction of a substring that matches a POSIX regular
 +     expression pattern.  It has the syntax:
 +<synopsis>
 +substring(<replaceable>string</replaceable> from <replaceable>pattern</replaceable>) <returnvalue>text</returnvalue>
 +substring(<replaceable>string</replaceable>, <replaceable>pattern</replaceable>) <returnvalue>text</returnvalue>
 +</synopsis>
 +     (The syntax with <literal>from</literal> is SQL-standard, but
 +     <productname>PostgreSQL</productname> also accepts a comma.)
++=======
+      The <function>substring</function> function with two parameters provides extraction of a
+      substring that matches a <acronym>POSIX</acronym> regular expression pattern.
+      The function can be written according to standard <acronym>SQL</acronym> syntax:
+ <synopsis>
+ substring(<replaceable>source</replaceable> FROM <replaceable>pattern</replaceable>)
+ </synopsis>
+      It can also written as a plain two-argument function:
+ <synopsis>
+ substring(<replaceable>source</replaceable>, <replaceable>pattern</replaceable>)
+ </synopsis>
++>>>>>>> theirs
       It returns null if
       there is no match, otherwise the first portion of the text that matched the
       pattern.  But if the pattern contains any parentheses, the portion