tree d228feda3b1db5e5909a9cb09e9c9feb33eab6f2
parent 1a89ac8b2803fc21271bd62468342473603b9f80
author Steven Perron <stevenperron@google.com> 1564061658 -0400
committer GitHub <noreply@github.com> 1564061658 -0400
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJdOa/aCRBK7hj4Ov3rIwAAdHIIAHuXbxem47eg/uqn8LE/EobK
 hE0F5z5X/E+blBk2Ey1nHEx4lrbSQyupurdRnwO0UiZRRM40RQr4meUbpKQ8uOac
 bCNz0jViO9KD7xZ3wsvZcqYhY5HVNbxjtEBtGlyDdEjY2D1JOVs2s3j9RPMfh85L
 sqeBpfE2VmOGTgJLIqvUx7Ap26PXYtrsJF2tJpGuPnEjal1Kk6IgtkU+izZRQg52
 oX+4GYuDSRDPjmwQVGvbRsc9wuiTYl8v7Kha7KtllReqRmRFCjcBScys1xrSZBEG
 8pzL2LR/wtAGcBtCRlVrKVq+8efOV+psXneQ3p6I3/wvMFbgpzrFLuHGhuaORW4=
 =66il
 -----END PGP SIGNATURE-----
 

Fix check for unreachable blocks in merge-return (#2762)

Merge return expects unreachable merge block to look a certain way, and
unreachable continue blocks to look a certain way.  What if an
unreachable block is both a merge and a continue?  The continue is
suppose to take precedent, but merge-return implements it with the merge
taking precedent.  This change flips that around.

Fixes #2746