=== Applying patches on top of PostgreSQL commit ID b8e1f2d96bb99ad3528d035861bd311b9f8eb5a9 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Jul 12 09:55:20 UTC 2025
On branch cf/5858
nothing to commit, working tree clean
=== using 'git am' to apply patch ./protocol.patch ===
Patch format detection failed.
=== using patch(1) to apply patch ./protocol.patch ===
patching file doc/src/sgml/protocol.sgml
Hunk #1 FAILED at 6081.
1 out of 1 hunk FAILED -- saving rejects to file doc/src/sgml/protocol.sgml.rej
Removing doc/src/sgml/protocol.sgml.rej
=== using 'git apply' to apply patch ./protocol.patch ===
Applied patch to 'doc/src/sgml/protocol.sgml' with conflicts.
U doc/src/sgml/protocol.sgml
diff --cc doc/src/sgml/protocol.sgml
index 4cfd9767f7c,b2e55184632..00000000000
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@@ -6081,14 -6081,13 +6081,24 @@@ psql "dbname=postgres replication=datab
        </varlistentry>
  
        <varlistentry>
++<<<<<<< ours
 +       <term>Int32</term>
 +       <listitem>
 +        <para>
 +         The protocol version number.  The most significant 16 bits are
 +         the major version number. The least significant 16 bits are the minor
 +         version number. As an example protocol version 3.2 is represented as
 +         <literal>196610</literal> in decimal or more clearly as
 +         <literal>0x00030002</literal> in hexadecimal.
++=======
+        <term>Int32(196610)</term>
+        <listitem>
+         <para>
+          The protocol version number.  The most significant 16 bits are
+          the major version number (3 for the protocol described here).
+          The least significant 16 bits are the minor version number
+          (2 for the protocol described here).
++>>>>>>> theirs
          </para>
         </listitem>
        </varlistentry>