CREATEROLE and role ownership hierarchies

Applying: Add owners to roles
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/create_role.sgml
M	src/backend/catalog/aclchk.c
M	src/backend/catalog/objectaddress.c
M	src/backend/catalog/pg_shdepend.c
M	src/backend/catalog/system_views.sql
M	src/backend/commands/alter.c
M	src/backend/commands/schemacmds.c
M	src/backend/commands/user.c
M	src/backend/nodes/copyfuncs.c
M	src/backend/nodes/equalfuncs.c
M	src/backend/parser/gram.y
M	src/backend/utils/adt/acl.c
M	src/bin/psql/describe.c
M	src/include/catalog/pg_authid.h
M	src/include/commands/user.h
M	src/include/nodes/parsenodes.h
M	src/include/utils/acl.h
M	src/test/modules/dummy_seclabel/expected/dummy_seclabel.out
M	src/test/modules/dummy_seclabel/sql/dummy_seclabel.sql
M	src/test/modules/unsafe_tests/expected/rolenames.out
M	src/test/modules/unsafe_tests/sql/rolenames.sql
M	src/test/regress/expected/create_role.out
M	src/test/regress/expected/oidjoins.out
M	src/test/regress/expected/privileges.out
M	src/test/regress/expected/rules.out
M	src/test/regress/sql/create_role.sql
M	src/test/regress/sql/privileges.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/privileges.sql
Auto-merging src/test/regress/sql/create_role.sql
CONFLICT (content): Merge conflict in src/test/regress/sql/create_role.sql
Auto-merging src/test/regress/expected/rules.out
Auto-merging src/test/regress/expected/privileges.out
Auto-merging src/test/regress/expected/oidjoins.out
Auto-merging src/test/regress/expected/create_role.out
CONFLICT (content): Merge conflict in src/test/regress/expected/create_role.out
Auto-merging src/test/modules/unsafe_tests/sql/rolenames.sql
Auto-merging src/test/modules/unsafe_tests/expected/rolenames.out
Auto-merging src/test/modules/dummy_seclabel/sql/dummy_seclabel.sql
CONFLICT (content): Merge conflict in src/test/modules/dummy_seclabel/sql/dummy_seclabel.sql
Auto-merging src/test/modules/dummy_seclabel/expected/dummy_seclabel.out
CONFLICT (content): Merge conflict in src/test/modules/dummy_seclabel/expected/dummy_seclabel.out
Auto-merging src/include/utils/acl.h
CONFLICT (content): Merge conflict in src/include/utils/acl.h
Auto-merging src/include/nodes/parsenodes.h
Auto-merging src/include/commands/user.h
Auto-merging src/include/catalog/pg_authid.h
Auto-merging src/bin/psql/describe.c
Auto-merging src/backend/utils/adt/acl.c
Auto-merging src/backend/parser/gram.y
Auto-merging src/backend/nodes/equalfuncs.c
CONFLICT (content): Merge conflict in src/backend/nodes/equalfuncs.c
Auto-merging src/backend/nodes/copyfuncs.c
CONFLICT (content): Merge conflict in src/backend/nodes/copyfuncs.c
Auto-merging src/backend/commands/user.c
CONFLICT (content): Merge conflict in src/backend/commands/user.c
Auto-merging src/backend/commands/schemacmds.c
Auto-merging src/backend/commands/alter.c
Auto-merging src/backend/catalog/system_views.sql
Auto-merging src/backend/catalog/pg_shdepend.c
CONFLICT (content): Merge conflict in src/backend/catalog/pg_shdepend.c
Auto-merging src/backend/catalog/objectaddress.c
CONFLICT (content): Merge conflict in src/backend/catalog/objectaddress.c
Auto-merging src/backend/catalog/aclchk.c
CONFLICT (content): Merge conflict in src/backend/catalog/aclchk.c
Auto-merging doc/src/sgml/ref/create_role.sgml
Patch failed at 0001 Add owners to roles

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"