Skip to content

Commit

Permalink
Add vimdiff enhance
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffbuttars committed Mar 10, 2015
1 parent b3d9f20 commit 13eaa29
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 0 additions & 2 deletions vim/.vimrc
Expand Up @@ -81,7 +81,6 @@ filetype on
set switchbuf=useopen
set laststatus=2 " last window will always have a status line
set showcmd " display incomplete commands
set lazyredraw " Don't redraw screen when executing macros
"
" * [switchbuf][]
" * [laststatus][]
Expand Down Expand Up @@ -348,7 +347,6 @@ set sessionoptions=winpos,localoptions
" See if we can speed things up with
" lazyredraw and ttyfast
set lazyredraw
set ttyfast

" Make sure I get the expected behavior from ctrl-]
" if cscopetag is set, ctrl-] will try to be too smart
Expand Down
1 change: 1 addition & 0 deletions vim/vimrc/bundles.vim
Expand Up @@ -70,6 +70,7 @@ NeoBundle 'https://github.com/honza/vim-snippets'
NeoBundle 'https://github.com/vim-scripts/stata.vim'
NeoBundle 'https://github.com/jacquesbh/vim-showmarks.git'
NeoBundle 'https://github.com/zah/nimrod.vim'
NeoBundle 'chrisbra/vim-diff-enhanced'

" Tornado template syntax
NeoBundle 'https://github.com/vim-scripts/tornadotmpl.vim.git'
Expand Down

0 comments on commit 13eaa29

Please sign in to comment.