=== Applying patches on top of PostgreSQL commit ID fd519419c9484a47f068cc04e2db81a4ec661669 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Tue Jun 24 23:54:18 UTC 2025 On branch cf/5847 nothing to commit, working tree clean === using 'git am' to apply patch ./doc-reorder-entities-and-comment.diff === Patch format detection failed. === using patch(1) to apply patch ./doc-reorder-entities-and-comment.diff === patching file doc/src/sgml/docguide.sgml Hunk #1 succeeded at 68 (offset -2 lines). patching file doc/src/sgml/filelist.sgml Hunk #3 FAILED at 166. Hunk #4 succeeded at 178 (offset 1 line). Hunk #5 succeeded at 187 (offset 1 line). 1 out of 5 hunks FAILED -- saving rejects to file doc/src/sgml/filelist.sgml.rej patching file doc/src/sgml/postgres.sgml patching file doc/src/sgml/ref/allfiles.sgml patching file doc/src/sgml/reference.sgml Unstaged changes after reset: M doc/src/sgml/docguide.sgml M doc/src/sgml/filelist.sgml M doc/src/sgml/postgres.sgml M doc/src/sgml/ref/allfiles.sgml M doc/src/sgml/reference.sgml Removing doc/src/sgml/filelist.sgml.rej === using 'git apply' to apply patch ./doc-reorder-entities-and-comment.diff === Applied patch to 'doc/src/sgml/docguide.sgml' cleanly. Applied patch to 'doc/src/sgml/filelist.sgml' with conflicts. Applied patch to 'doc/src/sgml/postgres.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/allfiles.sgml' cleanly. Applied patch to 'doc/src/sgml/reference.sgml' cleanly. U doc/src/sgml/filelist.sgml diff --cc doc/src/sgml/filelist.sgml index fef9584f908,4f92942964c..00000000000 --- a/doc/src/sgml/filelist.sgml +++ b/doc/src/sgml/filelist.sgml @@@ -144,8 -166,7 +166,12 @@@ ++<<<<<<< ours + + ++======= + ++>>>>>>> theirs