Improved do-vimdiff command