From fd85d405d40c75bff6557587e4fc1edaab5e1b3c Mon Sep 17 00:00:00 2001
From: Bo Jeanes <me@bjeanes.com>
Date: Sun, 2 Apr 2017 10:19:47 +1000
Subject: [PATCH] Fix Kaleidoscope tool for git merging

---
 vcs/git/gitconfig       | 8 +++++---
 vcs/git/gitconfig.merge | 9 ++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/vcs/git/gitconfig b/vcs/git/gitconfig
index 6526eda..20c8a0b 100644
--- a/vcs/git/gitconfig
+++ b/vcs/git/gitconfig
@@ -65,9 +65,11 @@
 	algorithm = minimal
 	mnemonicprefix = true
 	renames = copies
-[merge]
-	conflictstyle = diff3
-	tool = Kaleidoscope
+	tool = ksdiff
+[difftool]
+	prompt = false
+[difftool "ksdiff"]
+  cmd = "ksdiff $LOCAL $REMOTE"
 [pull]
 	rebase = true
 [heroku]
diff --git a/vcs/git/gitconfig.merge b/vcs/git/gitconfig.merge
index 51c153a..4ed14f8 100644
--- a/vcs/git/gitconfig.merge
+++ b/vcs/git/gitconfig.merge
@@ -2,7 +2,14 @@
 
 [merge]
 	summary = true
-	tool = opendiff
+	conflictstyle = diff3
+	tool = Kaleidoscope
+
+[mergetool "Kaleidoscope"]
+	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+	trustExitCode = true
+[mergetool]
+	prompt = false
 
 # http://bitfission.com/blog/2010/07/auto-merge-gemfile-lock.html
 [merge "bundlelock"]