Commits

Stefan Scherfke  committed ad0a8de

Added Splice plug-in to vim.

  • Participants
  • Parent commits e2379e4

Comments (0)

Files changed (3)

 _vim/bundle/python-mode = [git]https://github.com/klen/python-mode.git
 _vim/bundle/pyflakes-vim = [git]https://github.com/kevinw/pyflakes-vim.git
 _vim/bundle/repeat = [git]https://github.com/tpope/vim-repeat.git
+_vim/bundle/splice = [hg]ssh://hg@bitbucket.org/sjl/splice.vim
 _vim/bundle/snipmate = [git]https://github.com/msanders/snipmate.vim.git
 _vim/bundle/supertab = [git]https://github.com/ervandew/supertab.git
 _vim/bundle/surround = [git]https://github.com/tpope/vim-surround.git
 9f976bb5754fd1252198fd1d8da4508a1a612ef6 _vim/bundle/python-mode
 d75a544b786710705f0db0d8d8fd66ca4a5a7239 _vim/bundle/repeat
 f5a75d075d3c005ebe69e3f5e56cf99516e8aa3b _vim/bundle/snipmate
+3a2ab096c039516a8f43e6acd0264d8a81cd0544 _vim/bundle/splice
 ee35ab6954a11337a2b52003d07fabe442843b68 _vim/bundle/supertab
 1a73f607f8f5477d6942df2eb6e7245c4864f4d3 _vim/bundle/surround
 4d55a4b55666a5846956655e1a1ca30004702b06 _vim/bundle/tcomment
 complexity = 12
 
 [merge-tools]
+splice.executable = mvim
+splice.args = -f $base $local $other $output -c 'SpliceInit'
+splice.premerge = keep
+splice.priority = 1
+
+spliceg.executable = gvim
+spliceg.args = -f $base $local $other $output -c 'SpliceInit'
+spliceg.premerge = keep
+spliceg.priority = 1
+
 filemerge.executable = opendiff-w
 filemerge.args = $local $other -ancestor $base -merge $output
+
 kdiff3.args = $base $local $other -o $output
 
 [web]