Skip to content
Browse files

Added Threesome 3-way merge plugin

  • Loading branch information...
1 parent 3230b91 commit be5e2273755b5d600eed3b2368c0e28669f4ec4c @jyurek committed Jun 29, 2011
Showing with 10 additions and 0 deletions.
  1. +1 −0 .gitignore
  2. +7 −0 gitconfig
  3. +1 −0 vim/bundle/threesome.vim
  4. +1 −0 vim/vim
View
1 .gitignore
@@ -1,3 +1,4 @@
.netrwhist
vim/saved_session
*DS_Store
+backup
View
7 gitconfig
@@ -54,3 +54,10 @@
insteadOf = "gist:"
[url "git@heroku.com:"]
insteadOf = "heroku:"
+[push]
+ default = tracking
+[merge]
+ tool = threesome
+[mergetool "threesome"]
+ cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
+ trustExitCode = true
1 vim/bundle/threesome.vim
@@ -0,0 +1 @@
+Subproject commit 99c4cf09871c72f1d02819d3a8663a1df869aa02
View
1 vim/vim

0 comments on commit be5e227

Please sign in to comment.
Something went wrong with that request. Please try again.