The Kaleidoscope integration seems to be broken with SourceTree 2.2.2 (51).
I'm using MacOSX 10.11.3 (15D21) and Kaleidoscope 2.1.0 (133.01) from the App Store.
This worked before the update to SourceTree 2.2.x.
When I click on "open external merge tool" (right click on merge conflict file) Kaleidoscope will not open Kaleidoscope. The merge information window appears for a very short time and multiple files are created.
Is there any way to fix this manually or do I have to wait for an update?
I have the same problem. `git mergetool` from the command line still works fine, so the problem is definitely on the Sourcetree side.
You can fix this manually by going into your Sourcetree preferences, to the Diff tab, and using a "Custom" merge tool. The command is "ksdiff", and the arguments are:
--merge --base "$BASE" --output "$MERGED" "$LOCAL" "$REMOTE"
Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs