setup kaleidoscope as a merge tool

2015-07-25 18:23:23 -05:00
parent 1d031bd6f5
commit cfbcb54941
1 changed files with 1 additions and 0 deletions
--- 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