=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Jan 31 20:54:22 UTC 2025
On branch cf/5063
nothing to commit, working tree clean
=== applying patch ./v3-0001-Support-Non-Key-Filter-for-multicolumn-B-Tree-Ind.patch
Applied patch to 'src/backend/access/nbtree/nbtree.c' with conflicts.
Applied patch to 'src/backend/commands/explain.c' cleanly.
Applied patch to 'src/include/access/amapi.h' cleanly.
Applied patch to 'src/include/access/nbtree.h' cleanly.
Applied patch to 'src/include/commands/explain.h' cleanly.
U src/backend/access/nbtree/nbtree.c
diff --cc src/backend/access/nbtree/nbtree.c
index 3d617f168f,2e3c6d6e56..0000000000
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@@ -20,17 -20,24 +20,25 @@@
  
  #include "access/nbtree.h"
  #include "access/relscan.h"
++<<<<<<< ours
++=======
+ #include "access/xloginsert.h"
+ #include "commands/explain.h"
++>>>>>>> theirs
  #include "commands/progress.h"
  #include "commands/vacuum.h"
 -#include "miscadmin.h"
  #include "nodes/execnodes.h"
+ #include "nodes/nodeFuncs.h"
+ #include "nodes/plannodes.h"
  #include "pgstat.h"
  #include "storage/bulk_write.h"
  #include "storage/condition_variable.h"
  #include "storage/indexfsm.h"
  #include "storage/ipc.h"
  #include "storage/lmgr.h"
 -#include "storage/smgr.h"
  #include "utils/fmgrprotos.h"
  #include "utils/index_selfuncs.h"
+ #include "utils/lsyscache.h"
  #include "utils/memutils.h"