=== Applying patches on top of PostgreSQL commit ID 3ba2cdaa45416196fadc7163998cda7b4e07e7d7 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Apr  4 15:59:25 UTC 2025
On branch cf/5283
nothing to commit, working tree clean
=== using 'git am' to apply patch ./values_test.diff ===
Patch format detection failed.
=== using patch(1) to apply patch ./values_test.diff ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./values_test.diff ===
Applied patch to 'src/test/regress/expected/subselect.out' with conflicts.
Applied patch to 'src/test/regress/sql/subselect.sql' with conflicts.
U src/test/regress/expected/subselect.out
U src/test/regress/sql/subselect.sql
diff --cc src/test/regress/expected/subselect.out
index 40d8056fcea,33a10e8f518..00000000000
--- a/src/test/regress/expected/subselect.out
+++ b/src/test/regress/expected/subselect.out
@@@ -2755,29 -2755,16 +2755,42 @@@ SELECT * from onek WHERE unique1 in (VA
  
  -- VtA shouldn't depend on the side of the join probing with the VALUES expression.
  EXPLAIN (COSTS OFF)
++<<<<<<< ours
 +SELECT c.unique1,c.ten FROM tenk1 c JOIN onek a USING (ten)
 +WHERE a.ten IN (VALUES (1), (2));
 +                    QUERY PLAN                    
 +--------------------------------------------------
 + Hash Join
 +   Hash Cond: (a.ten = c.ten)
 +   ->  Seq Scan on onek a
 +         Filter: (ten = ANY ('{1,2}'::integer[]))
 +   ->  Hash
 +         ->  Seq Scan on tenk1 c
 +(6 rows)
 +
 +EXPLAIN (COSTS OFF)
 +SELECT c.unique1,c.ten FROM tenk1 c JOIN onek a USING (ten)
 +WHERE c.ten IN (VALUES (1), (2));
 +                    QUERY PLAN                    
 +--------------------------------------------------
 + Hash Join
 +   Hash Cond: (c.ten = a.ten)
 +   ->  Seq Scan on tenk1 c
 +         Filter: (ten = ANY ('{1,2}'::integer[]))
 +   ->  Hash
 +         ->  Seq Scan on onek a
++=======
+ SELECT c.unique1,c.ten FROM onek c JOIN tenk1 a USING (ten)
+ WHERE a.ten IN (VALUES (1), (2));
+                     QUERY PLAN                    
+ --------------------------------------------------
+  Hash Join
+    Hash Cond: (a.ten = c.ten)
+    ->  Seq Scan on tenk1 a
+          Filter: (ten = ANY ('{1,2}'::integer[]))
+    ->  Hash
+          ->  Seq Scan on onek c
++>>>>>>> theirs
  (6 rows)
  
  -- Constant expressions are simplified
diff --cc src/test/regress/sql/subselect.sql
index fec38ef85a6,46b12df9f5c..00000000000
--- a/src/test/regress/sql/subselect.sql
+++ b/src/test/regress/sql/subselect.sql
@@@ -1243,11 -1243,8 +1243,16 @@@ SELECT * from onek WHERE unique1 in (VA
  
  -- VtA shouldn't depend on the side of the join probing with the VALUES expression.
  EXPLAIN (COSTS OFF)
++<<<<<<< ours
 +SELECT c.unique1,c.ten FROM tenk1 c JOIN onek a USING (ten)
 +WHERE a.ten IN (VALUES (1), (2));
 +EXPLAIN (COSTS OFF)
 +SELECT c.unique1,c.ten FROM tenk1 c JOIN onek a USING (ten)
 +WHERE c.ten IN (VALUES (1), (2));
++=======
+ SELECT c.unique1,c.ten FROM onek c JOIN tenk1 a USING (ten)
+ WHERE a.ten IN (VALUES (1), (2));
++>>>>>>> theirs
  
  -- Constant expressions are simplified
  EXPLAIN (COSTS OFF)