Fold NOT IN / <> ALL expressions containing NULL to FALSE

Applying: Fold never-true "x op ALL (array)" to false in qual context
Using index info to reconstruct a base tree...
M	src/backend/commands/copy.c
M	src/backend/optimizer/plan/planner.c
M	src/backend/optimizer/plan/subselect.c
M	src/backend/optimizer/util/clauses.c
M	src/test/regress/expected/insert_conflict.out
M	src/test/regress/expected/partition_prune.out
M	src/test/regress/expected/predicate.out
M	src/test/regress/sql/insert_conflict.sql
M	src/test/regress/sql/predicate.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/predicate.sql
Auto-merging src/test/regress/sql/insert_conflict.sql
Auto-merging src/test/regress/expected/predicate.out
Auto-merging src/test/regress/expected/partition_prune.out
Auto-merging src/test/regress/expected/insert_conflict.out
Auto-merging src/backend/optimizer/util/clauses.c
Auto-merging src/backend/optimizer/plan/subselect.c
Auto-merging src/backend/optimizer/plan/planner.c
CONFLICT (content): Merge conflict in src/backend/optimizer/plan/planner.c
Auto-merging src/backend/commands/copy.c
Patch failed at 0001 Fold never-true "x op ALL (array)" to false in qual context

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"