BUG #18970: Atempt to alter type of table column used in row type with check leads to assertion failure

Applying: fix-bug-18970
Using index info to reconstruct a base tree...
M	src/backend/commands/tablecmds.c
M	src/test/regress/expected/alter_table.out
M	src/test/regress/expected/generated_stored.out
M	src/test/regress/sql/alter_table.sql
M	src/test/regress/sql/generated_stored.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/generated_stored.sql
CONFLICT (content): Merge conflict in src/test/regress/sql/generated_stored.sql
Auto-merging src/test/regress/sql/alter_table.sql
CONFLICT (content): Merge conflict in src/test/regress/sql/alter_table.sql
Auto-merging src/test/regress/expected/generated_stored.out
CONFLICT (content): Merge conflict in src/test/regress/expected/generated_stored.out
Auto-merging src/test/regress/expected/alter_table.out
CONFLICT (content): Merge conflict in src/test/regress/expected/alter_table.out
Auto-merging src/backend/commands/tablecmds.c
CONFLICT (content): Merge conflict in src/backend/commands/tablecmds.c
Patch failed at 0001 fix-bug-18970

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"