Embedded File Compare/Merge

The embedded File Compare/Merge gives you a quick way to do a comparison of text in two files or versions of the same file, as well as compare properties of non-file items such as change requests. If you are comparing two text files, it performs a dynamic comparison of two selected files, or the selected repository file with your local working copy. It displays the text contents of both files in an embedded pair of panes at the bottom of the StarTeam window. These embedded panes only compare the contents of two text files, and do not permit editing or merging.

If you are comparing the properties of two non-file items, only the property values of each selected item display in the embedded panes.

When the embedded File Compare/Merge is activated, it immediately compares the files or properties when you do one of the following:

Select a file or other item in the upper pane, or the History view. The comparison is between the local working copy of the item and the selected item revision in StarTeam.
Select two items in the History view. The comparison is between the two historical revisions in StarTeam.