svn diff + vimdiff