Permalink
Browse files

Replace threesome.vim with splice.vim for merges

Splice.vim is threesome's new name. *Sigh*.
  • Loading branch information...
caio committed Jul 14, 2012
1 parent fe0fd75 commit 14dc669f8d68809a354d4ce43ea38d3731e4e927
Showing with 6 additions and 2 deletions.
  1. +6 −2 vimrc
View
8 vimrc
@@ -45,12 +45,16 @@ Bundle "petdance/vim-perl"
" {{{ Git Helpers
let g:Gitv_WipeAllOnClose=1
let g:Gitv_OpenHorizontal=1
-let g:threesome_leader = "-"
+let g:splice_prefix = "-"
+let g:splice_initial_scrollbind_grid=1
+let g:splice_initial_scrollbind_loupe=1
+let g:splice_initial_scrollbind_compare=1
+let g:splice_initial_scrollbind_path=1
Bundle "gregsexton/gitv"
Bundle "tpope/vim-fugitive"
Bundle "tpope/vim-git"
-Bundle "sjl/threesome.vim"
+Bundle "sjl/splice.vim"
" }}}
" {{{ Uncategorized

0 comments on commit 14dc669

Please sign in to comment.