Permalink
Browse files

Use vim+threesome as git mergetool

  • Loading branch information...
1 parent 68a4310 commit ecb468e5cbf53cc9bc3ec7d2144dde996db729e3 @caio committed Apr 9, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 gitconfig
View
2 gitconfig
@@ -40,7 +40,7 @@
log = true
[mergetool "threesome"]
- cmd = gvim --nofork -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'
+ cmd = vim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'
trustExitCode = true
[help]

0 comments on commit ecb468e

Please sign in to comment.