Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use threesome as mergetool

  • Loading branch information...
commit c970385528abdd3df703c28bc8f81789e47a1d79 1 parent 4d48149
@caio authored
Showing with 5 additions and 1 deletion.
  1. +5 −1 gitconfig
View
6 gitconfig
@@ -33,9 +33,13 @@
insteadOf = gh:
[merge]
- tool = gvimdiff
+ tool = threesome
log = true
+[mergetool "threesome"]
+ cmd = gvim --nofork -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'
+ trustExitCode = true
+
[help]
autocorrect = 5
Please sign in to comment.
Something went wrong with that request. Please try again.