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