Added vimdiff handling