vimdiff, svn and relinker tweaks