setup kaleidoscope as a merge tool
This commit is contained in:
@@ -77,6 +77,7 @@
|
|||||||
|
|
||||||
# Kaleidoscope commands
|
# Kaleidoscope commands
|
||||||
dkal = difftool -y -t Kaleidoscope
|
dkal = difftool -y -t Kaleidoscope
|
||||||
|
mkal = mergetool -y -t Kaleidoscope
|
||||||
remotes = remote -v
|
remotes = remote -v
|
||||||
|
|
||||||
# check out a local copy of a PR. https://gist.github.com/gnarf/5406589
|
# check out a local copy of a PR. https://gist.github.com/gnarf/5406589
|
||||||
|
|||||||
Reference in New Issue
Block a user