Schema-qualify the equality operator when deparsing NULLIF/IS DISTINCT FROM

Applying: Allow schema-qualifying the operators of JOIN USING
Using index info to reconstruct a base tree...
M	doc/src/sgml/queries.sgml
M	doc/src/sgml/ref/select.sgml
M	src/backend/parser/gram.y
M	src/backend/parser/parse_clause.c
M	src/backend/utils/adt/ruleutils.c
M	src/include/catalog/catversion.h
M	src/include/nodes/primnodes.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/nodes/primnodes.h
Auto-merging src/include/catalog/catversion.h
CONFLICT (content): Merge conflict in src/include/catalog/catversion.h
Auto-merging src/backend/utils/adt/ruleutils.c
Auto-merging src/backend/parser/parse_clause.c
Auto-merging src/backend/parser/gram.y
Auto-merging doc/src/sgml/ref/select.sgml
Auto-merging doc/src/sgml/queries.sgml
Patch failed at 0001 Allow schema-qualifying the operators of JOIN USING

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"