tgupdate: merge top-bases/t/misc/no-nbsp into t/misc/no-nbsp