Fix Kaleidoscope tool for git merging

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]

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"]