VW, Mercedes and Renault are among automakers who have agreed a deal with the Austrian government to update the software in 600,000 diesel cars and offer incentives to buyers of more environmentally friendly vehicles.