adding vim as a mergetool