From a915289a41196cb4c5b93cbb1a929ead998bc6a5 Mon Sep 17 00:00:00 2001
From: Danielle McLean <gopsychonauts@gmail.com>
Date: Sat, 19 Nov 2016 19:08:39 +1100
Subject: [PATCH] Configure Kaleidoscope.app as default Git diff/merge tool
 when on MacOS platform

---
 config/git/config.os    |  3 +++
 config/git/tools/ksdiff | 14 ++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 config/git/config.os
 create mode 100644 config/git/tools/ksdiff

diff --git a/config/git/config.os b/config/git/config.os
new file mode 100644
index 0000000..5d9dc91
--- /dev/null
+++ b/config/git/config.os
@@ -0,0 +1,3 @@
+# vim: ft=gitconfig
+[include]
+	path = tools/ksdiff
diff --git a/config/git/tools/ksdiff b/config/git/tools/ksdiff
new file mode 100644
index 0000000..1fbf6fc
--- /dev/null
+++ b/config/git/tools/ksdiff
@@ -0,0 +1,14 @@
+# vim: ft=gitconfig
+[mergetool "Kaleidoscope"]
+	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+	trustexitcode = true
+[merge]
+	tool = Kaleidoscope
+[difftool "Kaleidoscope"]
+	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
+[difftool]
+	prompt = false
+[mergetool]
+	prompt = false
+[diff]
+	tool = Kaleidoscope