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