I couldn’t get vimdiff to do its stuff - but this fixes it: superuser.com/questions…