Yet another fast GiST build

Applying: Add sortsupport for gist_btree opclasses, for faster index builds.
Using index info to reconstruct a base tree...
M	contrib/btree_gist/Makefile
M	contrib/btree_gist/btree_bit.c
M	contrib/btree_gist/btree_bool.c
M	contrib/btree_gist/btree_bytea.c
M	contrib/btree_gist/btree_cash.c
M	contrib/btree_gist/btree_date.c
M	contrib/btree_gist/btree_enum.c
M	contrib/btree_gist/btree_float4.c
M	contrib/btree_gist/btree_float8.c
M	contrib/btree_gist/btree_gist.control
M	contrib/btree_gist/btree_gist.h
M	contrib/btree_gist/btree_inet.c
M	contrib/btree_gist/btree_int2.c
M	contrib/btree_gist/btree_int4.c
M	contrib/btree_gist/btree_int8.c
M	contrib/btree_gist/btree_interval.c
M	contrib/btree_gist/btree_macaddr.c
M	contrib/btree_gist/btree_macaddr8.c
M	contrib/btree_gist/btree_numeric.c
M	contrib/btree_gist/btree_oid.c
M	contrib/btree_gist/btree_text.c
M	contrib/btree_gist/btree_time.c
M	contrib/btree_gist/btree_ts.c
M	contrib/btree_gist/btree_uuid.c
M	contrib/btree_gist/expected/bool.out
M	contrib/btree_gist/expected/char.out
M	contrib/btree_gist/expected/cidr.out
M	contrib/btree_gist/expected/enum.out
M	contrib/btree_gist/expected/float4.out
M	contrib/btree_gist/expected/float8.out
M	contrib/btree_gist/expected/inet.out
M	contrib/btree_gist/expected/numeric.out
M	contrib/btree_gist/sql/cidr.sql
M	contrib/btree_gist/sql/enum.sql
M	contrib/btree_gist/sql/float4.sql
M	contrib/btree_gist/sql/float8.sql
M	contrib/btree_gist/sql/inet.sql
M	src/backend/access/gist/gistbuild.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/access/gist/gistbuild.c
Auto-merging contrib/btree_gist/sql/inet.sql
CONFLICT (content): Merge conflict in contrib/btree_gist/sql/inet.sql
Auto-merging contrib/btree_gist/sql/float8.sql
Auto-merging contrib/btree_gist/sql/float4.sql
Auto-merging contrib/btree_gist/sql/enum.sql
Auto-merging contrib/btree_gist/sql/cidr.sql
CONFLICT (content): Merge conflict in contrib/btree_gist/sql/cidr.sql
Auto-merging contrib/btree_gist/expected/numeric.out
Auto-merging contrib/btree_gist/expected/inet.out
CONFLICT (content): Merge conflict in contrib/btree_gist/expected/inet.out
Auto-merging contrib/btree_gist/expected/float8.out
Auto-merging contrib/btree_gist/expected/float4.out
Auto-merging contrib/btree_gist/expected/enum.out
Auto-merging contrib/btree_gist/expected/cidr.out
CONFLICT (content): Merge conflict in contrib/btree_gist/expected/cidr.out
Auto-merging contrib/btree_gist/expected/char.out
Auto-merging contrib/btree_gist/expected/bool.out
Auto-merging contrib/btree_gist/btree_uuid.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_uuid.c
Auto-merging contrib/btree_gist/btree_ts.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_ts.c
Auto-merging contrib/btree_gist/btree_time.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_time.c
Auto-merging contrib/btree_gist/btree_text.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_text.c
Auto-merging contrib/btree_gist/btree_oid.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_oid.c
Auto-merging contrib/btree_gist/btree_numeric.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_numeric.c
Auto-merging contrib/btree_gist/btree_macaddr8.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_macaddr8.c
Auto-merging contrib/btree_gist/btree_macaddr.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_macaddr.c
Auto-merging contrib/btree_gist/btree_interval.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_interval.c
Auto-merging contrib/btree_gist/btree_int8.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_int8.c
Auto-merging contrib/btree_gist/btree_int4.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_int4.c
Auto-merging contrib/btree_gist/btree_int2.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_int2.c
Auto-merging contrib/btree_gist/btree_inet.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_inet.c
Auto-merging contrib/btree_gist/btree_gist.h
Auto-merging contrib/btree_gist/btree_gist.control
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_gist.control
CONFLICT (add/add): Merge conflict in contrib/btree_gist/btree_gist--1.7--1.8.sql
Auto-merging contrib/btree_gist/btree_gist--1.7--1.8.sql
Auto-merging contrib/btree_gist/btree_float8.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_float8.c
Auto-merging contrib/btree_gist/btree_float4.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_float4.c
Auto-merging contrib/btree_gist/btree_enum.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_enum.c
Auto-merging contrib/btree_gist/btree_date.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_date.c
Auto-merging contrib/btree_gist/btree_cash.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_cash.c
Auto-merging contrib/btree_gist/btree_bytea.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_bytea.c
Auto-merging contrib/btree_gist/btree_bool.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_bool.c
Auto-merging contrib/btree_gist/btree_bit.c
CONFLICT (content): Merge conflict in contrib/btree_gist/btree_bit.c
Auto-merging contrib/btree_gist/Makefile
CONFLICT (content): Merge conflict in contrib/btree_gist/Makefile
Patch failed at 0001 Add sortsupport for gist_btree opclasses, for faster index builds.

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"