EDITOR evn variable set to vim
Using vimdiff for svn merge