git: use fugitive Gvdiff for mergetool + don't ask

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index c0eb5286242ecc4676681d3968e89cae0c176525..3422030b76feeff0c9619332735fb63518a48a52 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -37,8 +37,8 @@ Bundle 'ompugao/ctrlp-ros'
 Bundle 'firef0x/pkgbuild.vim'
 Bundle 'derekwyatt/vim-fswitch'
 " seems to have problems right now... may be add later?
-"Bundle 'jalcine/cmake.vim' 
-Bundle 'powerman/vim-plugin-viewdoc'
+" Bundle 'jalcine/cmake.vim'
+" Bundle 'powerman/vim-plugin-viewdoc'
 
 " remove entries first
 set runtimepath -=$HOME/.vim
@@ -359,9 +359,9 @@ let g:tex_flavor='latex'
 let g:Tex_DefaultTargetFormat='pdf'
 let g:Tex_MultipleCompileFormats='pdf'
 
-" vim-viewdoc {{{2
-let g:no_viewdoc_maps = 1
-nnoremap K :call ViewDoc('doc', '<cword>')<cr>
+" " vim-viewdoc {{{2
+" let g:no_viewdoc_maps = 1
+" nnoremap K :call ViewDoc('doc', '<cword>')<cr>
 
 " functions {{{1
 " auto source vimrc when saved