Permalink
Browse files

More.

  • Loading branch information...
1 parent 375eca7 commit 46e41efc1dedd8645b2ac41f10dc53a71e879569 @sjl committed Dec 20, 2012
Showing with 4 additions and 4 deletions.
  1. +1 −1 fish/config.fish
  2. +2 −2 gitconfig
  3. +1 −1 vim/vimrc
View
@@ -40,7 +40,7 @@ alias pbpb 'pbp | pb'
alias weechat 'weechat-curses'
-alias collapse="sed -e 's/ */ /g'"
+alias collapse "sed -e 's/ */ /g'"
alias cuts "cut -d' '"
alias pbc 'pbcopy'
View
@@ -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"]
View
@@ -1325,7 +1325,7 @@ let g:syntastic_jsl_conf = '$HOME/.vim/jsl.conf'
" }}}
" Splice {{{
-" let g:splice_leader = "-"
+let g:splice_prefix = "-"
let g:splice_initial_mode = "grid"

0 comments on commit 46e41ef

Please sign in to comment.