=== Applying patches on top of PostgreSQL commit ID 665cafe8a4bd23b4f14194b0671d3ef09dc55864 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Feb 21 13:46:26 UTC 2025
On branch cf/5547
nothing to commit, working tree clean
=== applying patch ./0001-doc-create-table-doc-enhancements.patch
Applied patch to 'doc/src/sgml/ref/create_table.sgml' with conflicts.
U doc/src/sgml/ref/create_table.sgml
diff --cc doc/src/sgml/ref/create_table.sgml
index 0a3e520f21,9a5dafb9af..0000000000
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@@ -58,10 -58,19 +58,19 @@@ CREATE [ <replaceable>persistence_mode<
  [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]
  [ TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> ]
  
- <phrase>where <replaceable class="parameter">column_constraint</replaceable> is:</phrase>
+ <phrase>where <replaceable>persistence_mode</replaceable> is: </phrase>
+ 
+ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } |
+ UNLOGGED
+ 
+ <phrase>and <replaceable>column_storage</replaceable> is:</phrase>
+ 
+ STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN | DEFAULT } [ COMPRESSION <replaceable>compression_method</replaceable> ]
+ 
+ <phrase>and <replaceable class="parameter">column_constraint</replaceable> is:</phrase>
  
  [ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ]
 -{ NOT NULL |
 +{ NOT NULL [ NO INHERIT ]  |
    NULL |
    CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] |
    DEFAULT <replaceable>default_expr</replaceable> |
@@@ -223,7 -242,9 +242,13 @@@ WITH ( MODULUS <replaceable class="para
       </para>
  
       <para>
++<<<<<<< ours
 +      This form is not supported for partitioned tables.
++=======
+       If specified on a partitioned table the property is recorded but ignored:
+       the entire partitioned table is not automatically truncated after a crash
+       or unclean shutdown.
++>>>>>>> theirs
       </para>
      </listitem>
     </varlistentry>