From 47bdf5bd2389cafb00bb1418faafb3e2803e6573 Mon Sep 17 00:00:00 2001
From: Julien Blanchard <julien@sideburns.eu>
Date: Fri, 16 Mar 2012 12:32:01 +0100
Subject: [PATCH] threesome.vim for merges

---
 gitconfig | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/gitconfig b/gitconfig
index adcfa12..ce18055 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,24 +1,30 @@
 [github]
 	user = julienXX
 	token = e8eda04536d1a3339818db5d06168a0f
+
 [user]
 	email = julien@sideburns.eu
 	name = Julien Blanchard
+
 [color]
   ui = auto
+
 [color "branch"]
   current = yellow reverse
   local = yellow
   remote = green
+
 [color "diff"]
   meta = yellow bold
   frag = magenta bold
   old = red bold
   new = green bold
+
 [color "status"]
   added = yellow
   changed = green
   untracked = cyan
+
 [alias]
   st = status -s
   ci = commit
@@ -27,26 +33,35 @@
   df = diff
   lg = log -p
   caa = commit -a --amend -C HEAD
-[merge]
-  tool = vim
-[mergetool "vim"]
-  cmd=/usr/local/bin/vim -d -g $LOCAL $MERGED $REMOTE
-  keepbackup=false
+
 [url "git@github.com:"]
   insteadOf = "gh:"
   pushInsteadOf = "github:"
   pushInsteadOf = "git://github.com/"
+
 [url "git://github.com/"]
   insteadOf = "github:"
+
 [url "git@gist.github.com:"]
   insteadOf = "gst:"
   pushInsteadOf = "gist:"
   pushInsteadOf = "git://gist.github.com/"
+
 [url "git://gist.github.com/"]
   insteadOf = "gist:"
+
 [url "git@heroku.com:"]
   insteadOf = "heroku:"
+
 [help]
 	autocorrect = 5
+
 [core]
 	excludesfile = /Users/julien/.gitignore_global
+
+[merge]
+  tool = threesome
+
+[mergetool "threesome"]
+  cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
+  trustExitCode = true