=== Applying patches on top of PostgreSQL commit ID 50e6eb731d98ab6d0e625a0b87fb327b172bbebd ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jan  1 20:06:29 UTC 2025
On branch cf/4351
nothing to commit, working tree clean
=== applying patch ./v20241106-0001-WIP-index-batching-prefetching.patch
Applied patch to 'src/backend/access/heap/heapam_handler.c' cleanly.
Applied patch to 'src/backend/access/index/genam.c' cleanly.
Applied patch to 'src/backend/access/index/indexam.c' cleanly.
Applied patch to 'src/backend/executor/execIndexing.c' cleanly.
Applied patch to 'src/backend/executor/execReplication.c' cleanly.
Applied patch to 'src/backend/executor/nodeIndexonlyscan.c' cleanly.
Applied patch to 'src/backend/executor/nodeIndexscan.c' cleanly.
Applied patch to 'src/backend/utils/adt/selfuncs.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
Applied patch to 'src/include/access/amapi.h' cleanly.
Applied patch to 'src/include/access/genam.h' with conflicts.
Applied patch to 'src/include/access/relscan.h' cleanly.
Applied patch to 'src/include/nodes/execnodes.h' cleanly.
Applied patch to 'src/test/regress/expected/sysviews.out' cleanly.
Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.
U src/include/access/genam.h
diff --cc src/include/access/genam.h
index 1be8739573,1d9a0868a9..0000000000
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@@ -14,7 -14,7 +14,11 @@@
  #ifndef GENAM_H
  #define GENAM_H
  
++<<<<<<< ours
 +#include "access/htup.h"
++=======
+ #include "access/itup.h"
++>>>>>>> theirs
  #include "access/sdir.h"
  #include "access/skey.h"
  #include "nodes/tidbitmap.h"