The merge tool that understands your code

Work amazing in Visual Studio 2012

I really want this merge tool to work inside of Visual Studio 2012. I live in Visual Studio all day long...and if merging can become better via calls to the TFS Build process for gated check-ins, I'd use this tool in a heart beat and sign it's high praises to every developer i meet.

I don't think the UI needs to match Visual Studio's, but it'd just be nice to have it open as a document in VS. I'm currently using Semantic Merge with VS, and it is working rather nicely, but it does take you out of the environment.

Devart Code Compare is a comparison/merge tool I've been using that opens docs inside VS.

I can't speak for the OP, but have you seen how the built-in TFS conflict resolution process works?

VS2012 puts all the windows in the main document editing area. It starts with a list of conflicts that need resolving, each of which you can choose to open in your configured merge tool. I use Beyond Compare at the moment (which obviously opens externally), but the built-in diff tool opens in another tab in the editor area. The accept/reject merge decision comes up as a modal dialog when you close the merge editor window/tab.