From 3557cb46540391838f2992d9cd5f64a0d499fcf8 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sat, 28 Dec 2013 11:32:38 +0000
Subject: [PATCH] Update gitconfig

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

diff --git a/gitconfig b/gitconfig
index dee4d0c..aea2775 100644
--- a/gitconfig
+++ b/gitconfig
@@ -32,3 +32,9 @@
   lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
 [branch]
   autosetuprebase = always
+[difftool "Kaleidoscope"]
+	cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
+[difftool]
+	prompt = false
+[diff]
+	tool = Kaleidoscope