Is the Visual Studio 2012 RC Diff Utility Compare-Only?

Question

I swear that in earlier versions of the preview/beta/whatever I was not only able to view the difference between two files, but also merge/update. Now I'm looking at a diff window and as far as I can tell there is no way to move lines from left to right, or right to left.

The window has a "Help" link at the bottom, leading to this page which, unfortunately has no coverage of any kind of merge. The only way I can do it at the moment is to manually copy and paste, or type the text on the left into the pane on the right.

Did Microsoft remove these features opting for a "compare-only" diff utility?

Are these tools available somewhere I'm not looking?

Is it possible my installation is corrupted? Can anyone confirm that they can not only compare, but also update using the RC.

Answer 1

The compare tool (I believe) doesn't have any merge options. However, if you right-click on a file in source control explorer and go to Branching & Merging > Merge you can perform a baseless merge between any two files (you have to browse for the file), and resolve conflicts within the merge tool. Hope that helps.