tgupdate: merge top-bases/t/misc/die-not-goto into t/misc/die-not-goto