Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- ########## Kaleidoscope ##########
- [diff]
- tool = Kaleidoscope
- [difftool]
- prompt = false
- [difftool "Kaleidoscope"]
- cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
- [merge]
- tool = Kaleidoscope
- [mergetool]
- prompt = false
- [mergetool "Kaleidoscope"]
- cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
- trustexitcode = true
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement