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.
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
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
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot