Comparing and Merging Files and Revisions

In Dimensions for Visual Studio, you can compare:

You can merge: