l10n: fast-forward here is ff-only merge, not push