Permalink
Browse files

vimdiff instead of threesome

  • Loading branch information...
1 parent 06fab58 commit e89c27accc57a97b452c7eaa094884c79a69e502 @julienXX committed Apr 23, 2012
Showing with 1 addition and 10 deletions.
  1. +1 −10 gitconfig
View
@@ -46,15 +46,6 @@
[core]
excludesfile = /Users/julien/.gitignore_global
[merge]
- tool = threesome
-[mergetool "threesome"]
- cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
- trustExitCode = true
+ tool = vimdiff
[push]
default = tracking
-[difftool "sourcetree"]
- cmd = opendiff \"$LOCAL\" \"$REMOTE\"
- path =
-[mergetool "sourcetree"]
- cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
- trustExitCode = true

0 comments on commit e89c27a

Please sign in to comment.