=== Applying patches on top of PostgreSQL commit ID 2f70871c2bc18d103d5dd25ff9d91e0da29412ee ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Feb 20 05:00:29 UTC 2025
On branch cf/5012
nothing to commit, working tree clean
=== applying patch ./v19-0001-Implement-Self-Join-Elimination.patch
Applied patch to 'doc/src/sgml/config.sgml' cleanly.
Applied patch to 'src/backend/optimizer/path/equivclass.c' cleanly.
Applied patch to 'src/backend/optimizer/path/indxpath.c' cleanly.
Applied patch to 'src/backend/optimizer/plan/analyzejoins.c' cleanly.
Applied patch to 'src/backend/optimizer/plan/planmain.c' cleanly.
Applied patch to 'src/backend/optimizer/prep/prepunion.c' cleanly.
Applied patch to 'src/backend/rewrite/rewriteManip.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_tables.c' with conflicts.
Applied patch to 'src/include/nodes/pathnodes.h' cleanly.
Applied patch to 'src/include/optimizer/optimizer.h' cleanly.
Applied patch to 'src/include/optimizer/paths.h' cleanly.
Applied patch to 'src/include/optimizer/planmain.h' cleanly.
Applied patch to 'src/include/rewrite/rewriteManip.h' cleanly.
Applied patch to 'src/test/regress/expected/equivclass.out' cleanly.
Applied patch to 'src/test/regress/expected/join.out' cleanly.
Applied patch to 'src/test/regress/expected/sysviews.out' cleanly.
Applied patch to 'src/test/regress/sql/equivclass.sql' cleanly.
Applied patch to 'src/test/regress/sql/join.sql' cleanly.
Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.
U src/backend/utils/misc/guc_tables.c
diff --cc src/backend/utils/misc/guc_tables.c
index 3cde94a175,cce7331460..0000000000
--- a/src/backend/utils/misc/guc_tables.c
+++ b/src/backend/utils/misc/guc_tables.c
@@@ -990,7 -990,7 +990,11 @@@ struct config_bool ConfigureNamesBool[
  	},
  	{
  		{"enable_self_join_elimination", PGC_USERSET, QUERY_TUNING_METHOD,
++<<<<<<< ours
 +			gettext_noop("Enables removal of unique self-joins."),
++=======
+ 			gettext_noop("Enable removal of unique self-joins."),
++>>>>>>> theirs
  			NULL,
  			GUC_EXPLAIN | GUC_NOT_IN_SAMPLE
  		},