News for hackers. Stuff that matters.
Re:Kaleidoscope 2.0 Beta - Diff and Merge Tool by rickenharp on Tuesday November 20, 2012 @02:36AM (#4808113)
Looking at the page, it doesn't seem as if it has 3-way-merge, which is something I'd expect from a merge tool with such a price tag.
Re:Kaleidoscope 2.0 Beta - Diff and Merge Tool by mike on Tuesday November 20, 2012 @07:11AM (#4808643)
I was trying this briefly last night. It does have 3-way-merge when you integrate it with your source control tool, however I couldn't seem to find a way to use this functionality when you're just using it standalone.