=== Applying patches on top of PostgreSQL commit ID 039549d70f6aa2daa3714a13752a08fa8ca2fb05 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Apr  7 23:10:19 UTC 2025
On branch cf/5548
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-docs-improve-custom-settings.patch ===
Patch format detection failed.
=== using patch(1) to apply patch ./v1-0001-docs-improve-custom-settings.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./v1-0001-docs-improve-custom-settings.patch ===
Applied patch to 'doc/src/sgml/config.sgml' cleanly.
Applied patch to 'doc/src/sgml/func.sgml' with conflicts.
U doc/src/sgml/func.sgml
diff --cc doc/src/sgml/func.sgml
index 9ab070adffb,605bf533eec..00000000000
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@@ -28591,8 -28193,14 +28591,19 @@@ acl      | {postgres=arwdDxtm/postgres,
         </para>
         <para>
          <function>set_config</function> accepts the NULL value for
++<<<<<<< ours
 +        <parameter>new_value</parameter>, but as settings cannot be null, it
 +        is interpreted as a request to reset the setting to its default value.
++=======
+         <parameter>new_value</parameter>, but as settings cannot be null this input
+         is interpreted as a request to set the setting to its default value.
+        </para>
+        <para>
+         If <parameter>setting_name</parameter> does not already exist
+         <function>set_config</function> throws an error unless the identifier is a valid
+         <link linkend="runtime-config-custom">custom option</link> name, in which it
+         creates a placeholder with the empty string as its old value.
++>>>>>>> theirs
         </para>
         <para>
          <literal>set_config('log_statement_stats', 'off', false)</literal>