=== Applying patches on top of PostgreSQL commit ID 901ed9b352b41f034e17bc540725082a488fce31 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun May 10 08:48:23 UTC 2026
On branch cf/6465
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Change-default-of-jit-to-off.patch ===
Applying: Change default of jit to off
Using index info to reconstruct a base tree...
M	doc/src/sgml/config.sgml
M	src/backend/jit/jit.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/postgresql.conf.sample
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/misc/postgresql.conf.sample
Auto-merging src/backend/utils/misc/guc_parameters.dat
Auto-merging src/backend/jit/jit.c
Auto-merging doc/src/sgml/config.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/config.sgml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Change default of jit to off
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 ./v1-0001-Change-default-of-jit-to-off.patch ===
patching file doc/src/sgml/config.sgml
Hunk #1 FAILED at 6510.
1 out of 1 hunk FAILED -- saving rejects to file doc/src/sgml/config.sgml.rej
patching file src/backend/jit/jit.c
Hunk #1 FAILED at 29.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/jit/jit.c.rej
patching file src/backend/utils/misc/guc_parameters.dat
Hunk #1 FAILED at 1356.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/misc/guc_parameters.dat.rej
patching file src/backend/utils/misc/postgresql.conf.sample
Hunk #1 FAILED at 469.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/misc/postgresql.conf.sample.rej
Removing doc/src/sgml/config.sgml.rej
Removing src/backend/jit/jit.c.rej
Removing src/backend/utils/misc/guc_parameters.dat.rej
Removing src/backend/utils/misc/postgresql.conf.sample.rej
=== using 'git apply' to apply patch ./v1-0001-Change-default-of-jit-to-off.patch ===
Applied patch to 'doc/src/sgml/config.sgml' with conflicts.
Applied patch to 'src/backend/jit/jit.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
U doc/src/sgml/config.sgml
diff --cc doc/src/sgml/config.sgml
index 73cc0412330,e78ad2d3e25..00000000000
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@@ -6817,7 -6510,8 +6817,12 @@@ SELECT * FROM parent WHERE key = 2400
          Determines whether <acronym>JIT</acronym> compilation may be used by
          <productname>PostgreSQL</productname>, if available (see <xref
          linkend="jit"/>).
++<<<<<<< ours
 +        The default is <literal>off</literal>.
++=======
+         The default is <literal>off</literal> (before
+         <productname>PostgreSQL</productname> 19 the default was <literal>on</literal>).
++>>>>>>> theirs
         </para>
        </listitem>
       </varlistentry>