Moved the set +e up to capture one more test in test-pick.  That test heirloom-sh to exit. (cherry picked from commit f793aa71e4f7375daeb2cc9ef25512172fcb1451)
Moved the set +e up to capture one more test in test-pick.  That
test heirloom-sh to exit.
(cherry picked from commit f793aa71e4f7375daeb2cc9ef25512172fcb1451)

dscho/nmh,dscho/nmh,mcr/nmh,dscho/nmh,dscho/nmh,mcr/nmh