For the last several months there has been a problem with the integration between SourceTree and Kaleidoscope. This is not the launching problem with 2.2.* – Kaleidoscope is launching correctly. What happens is this:
Configuring SourceTree to use FileMerge as the difftool/mergetool works fine.
Any ideas how to fix this? Thanks!
Warren
SourceTree sets up the .gitconfig file with this entry for Kaleidoscope:
[mergetool "sourcetree"] cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot trustExitCode = true
But it appears that ksdiff's exit code cannot be trusted. Changing the entry to the following makes everything work fine.
[mergetool "sourcetree"] cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot trustExitCode = false
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.