Currently, SourceTree supports Kaleiodoscope as a built-in diff visualisation tool, but not as a merge tool.
However, the just released Kaleidoscope 2.0 (which has been available as a public beta for several weeks) now has built-in three-way merge support.
Hey Eric,
SourceTree 1.5.7 supports Kaleidoscope 2 as a merge tool. This has been released to the public for direct downloaders and is currently in the App Store awaiting approval, so if you're an App Store user there'll be some delay until Apple approve it.
Hope that helps
Awesome! Thanks for the quick feedback. I do use the MAS version, so I'll wait.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.