Use vim as git editor and gvimdiff as mergetool
Use own vimrc instead of janus