[mike]

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.