--- a/.hgsub Wed Dec 12 11:58:41 2012 -0500
+++ b/.hgsub Thu Dec 20 11:50:41 2012 -0500
@@ -20,7 +20,6 @@
vim/bundle/python-mode = [git]git://github.com/klen/python-mode.git
vim/bundle/repeat = [git]git://github.com/tpope/vim-repeat.git
vim/bundle/salt = [git]git://github.com/saltstack/salt-vim.git
-vim/bundle/scriptease = [git]git://github.com/tpope/vim-scriptease.git
vim/bundle/slimv = [hg]https://bitbucket.org/sjl/slimv
vim/bundle/smartinput = [git]git://github.com/kana/vim-smartinput.git
vim/bundle/sparkup = [git]git://github.com/sjl/vim-sparkup.git
--- a/.hgsubstate Wed Dec 12 11:58:41 2012 -0500
+++ b/.hgsubstate Thu Dec 20 11:50:41 2012 -0500
@@ -20,11 +20,10 @@
cd6aec27d127053d18bd2a12713137e41d054208 vim/bundle/python-mode
613eb1c81261adfa5dead315089c432ff6dbbc51 vim/bundle/repeat
61a7567a3cdd68cb65ceb3061071ce66d8110e65 vim/bundle/salt
-2cbaf7e09b4767b15c92cd407b27506840b93c8b vim/bundle/scriptease
7eb00bb460f91dcb347b23198dff343b4d8e92a9 vim/bundle/slimv
78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput
c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
-22feac7bc42467a8b17c8b833bd24f36b02759a4 vim/bundle/splice
+e31bbce52b3fb080a9aa88fd92dd19dab0331de8 vim/bundle/splice
6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit
7ee7f774dd1288ea2e7c57b63cb069a07d425ca0 vim/bundle/supertab
1a73f607f8f5477d6942df2eb6e7245c4864f4d3 vim/bundle/surround
--- a/fish/config.fish Wed Dec 12 11:58:41 2012 -0500
+++ b/fish/config.fish Thu Dec 20 11:50:41 2012 -0500
@@ -40,7 +40,7 @@
alias weechat 'weechat-curses'
-alias collapse="sed -e 's/ */ /g'"
+alias collapse "sed -e 's/ */ /g'"
alias cuts "cut -d' '"
alias pbc 'pbcopy'
--- a/gitconfig Wed Dec 12 11:58:41 2012 -0500
+++ b/gitconfig Thu Dec 20 11:50:41 2012 -0500
@@ -89,10 +89,10 @@
tool = Kaleidoscope
[merge]
- tool = Kaleidoscope
+ tool = splice
[mergetool "splice"]
- cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
+ cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true
[mergetool "Kaleidoscope"]
--- a/vim/vimrc Wed Dec 12 11:58:41 2012 -0500
+++ b/vim/vimrc Thu Dec 20 11:50:41 2012 -0500
@@ -1325,7 +1325,7 @@
" }}}
" Splice {{{
-" let g:splice_leader = "-"
+let g:splice_prefix = "-"
let g:splice_initial_mode = "grid"