From 9df36b0a3f89a23417a9e4b6b5ef9d6191c7d0be Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Sat, 5 Jan 2013 10:28:25 -0800
Subject: [PATCH] Make Kaleidoscope git's diff and merge tool

---
 gitconfig | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gitconfig b/gitconfig
index 957470c..fa5c2f0 100644
--- a/gitconfig
+++ b/gitconfig
@@ -7,7 +7,7 @@
 [color]
     ui = auto
 [merge]
-    tool = Kaleidoscope
+	tool = Kaleidoscope
 [alias]
     # Commits
     c = commit
@@ -52,13 +52,14 @@
 [ui]
     color = true
 [diff]
-    tool = Kaleidoscope
+	tool = Kaleidoscope
 [mergetool]
     keepBackup = true
-    prompt = false
+	prompt = false
 [difftool]
-    prompt = false
+	prompt = false
 [difftool "Kaleidoscope"]
-    cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
+	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 [mergetool "Kaleidoscope"]
-    cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+	trustExitCode = true