From cfbcb549419bf462cc74fba3ada685830d1f8bb0 Mon Sep 17 00:00:00 2001
From: Nick Nisi <nick@nisi.org>
Date: Sat, 25 Jul 2015 18:23:23 -0500
Subject: [PATCH] setup kaleidoscope as a merge tool

---
 git/gitconfig.symlink | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 498762c..a4496e3 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -77,6 +77,7 @@
 
     # Kaleidoscope commands
     dkal = difftool -y -t Kaleidoscope
+    mkal = mergetool -y -t Kaleidoscope
     remotes = remote -v
 
     # check out a local copy of a PR. https://gist.github.com/gnarf/5406589