Comparing Files and Revisions

About Comparing and Merging

In Dimensions for Visual Studio you can compare:

You can merge: