It is a merge tool that is able to deal with conflicts at the structure level instead of text-based. It first parses the code and then handles the merge based on code structure. It means the refactor operations are now easy to merge... and diff. It is usable with Git, TFS, Plastic SCM, SVN and others. Free beta launched today.