-
-
Save awesome/7ab35c8d228fc0eb33e3e4b6c4505759 to your computer and use it in GitHub Desktop.
kaleidoscope git mergetool config
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Kaleidoscope.app as difftool and mergetool. | |
[difftool "Kaleidoscope"] | |
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" | |
[diff] | |
tool = Kaleidoscope | |
[difftool] | |
prompt = false | |
[mergetool "Kaleidoscope"] | |
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot | |
trustExitCode = true | |
[mergetool] | |
prompt = false | |
keepBackup = false | |
[merge] | |
tool = Kaleidoscope |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment