Also, it offers 3-way merge when files on disk change
which also have
local (unsaved) changes :)
If this is true, 3-way merge will be a KILLER FEATURE of TM2. I have
already Changes which does the job well, coz I couldn't stand retarded
FileMerge UI. But Changes now has been sold to some other company, and
well I don't know what's gonna happen with this nice tool, which's its
price already bumped up.