reindex concurrently and two toast indexes

Applying: Add an optional cancel on clause to isolationtester steps.
Using index info to reconstruct a base tree...
M	src/backend/utils/adt/lockfuncs.c
M	src/include/catalog/pg_proc.dat
M	src/test/isolation/README
M	src/test/isolation/isolationtester.c
M	src/test/isolation/isolationtester.h
M	src/test/isolation/specparse.y
M	src/test/isolation/specscanner.l
Falling back to patching base and 3-way merge...
Auto-merging src/test/isolation/specscanner.l
CONFLICT (content): Merge conflict in src/test/isolation/specscanner.l
Auto-merging src/test/isolation/specparse.y
CONFLICT (content): Merge conflict in src/test/isolation/specparse.y
Auto-merging src/test/isolation/isolationtester.h
CONFLICT (content): Merge conflict in src/test/isolation/isolationtester.h
Auto-merging src/test/isolation/isolationtester.c
CONFLICT (content): Merge conflict in src/test/isolation/isolationtester.c
Auto-merging src/test/isolation/README
CONFLICT (content): Merge conflict in src/test/isolation/README
Auto-merging src/include/catalog/pg_proc.dat
Auto-merging src/backend/utils/adt/lockfuncs.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/lockfuncs.c
Patch failed at 0001 Add an optional cancel on clause to isolationtester steps.

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"