fix some vimrc bug, config git difftool and mergetool