File Compare/Merge UI

This topic describes the UI for File Compare/Merge (FCM).

There are three versions of File Compare/Merge:

Each version provides different features and functions and is explained briefly below:

Embedded File Compare/Merge

The embedded File Compare/Merge enables you to quickly compare the contents of a local text file and a repository file, or two repository files. This view does not allow editing or merging.

Main File Compare/Merge

The main File Compare/Merge in the client enables you to compare local files with repository files, and edit or merge the contents. Each compare/merge session is displayed on a separate tab in the File Compare/Merge window.

Standalone File Compare/Merge

The standalone File Compare/Merge runs outside the StarTeam client and provides the following features:

  • A two or three-way file compare/merge.
  • A two or three-way folder compare/merge.
  • A two or three-way image comparison.

Three-way File Compare/Merge

The following image is an example of a three-way session.

Folder Compare/Merge

The following is an image of a folder compare/merge session.

Image Comparison

FCM has the ability to compare two or three images, and move or swap them, but not to edit them.

FCM Menus and Toolbar

The main and standalone File Compare/Merge windows have a main menu, a context menu, and a toolbar. The embedded File Compare/Merge has a context menu only, no main menu or toolbar.

The menus provide specific actions for comparing, editing, and merging files and folders. They are dynamic depending on which version of File Compare/Merge you are in, what type of files you are comparing, and how many panes you are using. In the main and standalone File Compare/Merge windows, a toolbar provides buttons for frequently used commands.

File Comparison Panes

The file comparison panes contain the contents of the files or folders being compared. In the main and standalone File Compare/Merge windows, dynamic action buttons for editing appear on color differences blocks. You can choose to display a two-way or three-way vertical or horizontal comparison mode.

Colors Representing Difference Types

File comparison and folder comparison in the Compare Pane of View Compare/Merge highlight difference types in color, with each color representing a certain difference type. For example, it highlights inserted or deleted items in green, changed items in yellow, and moved or renamed items in blue. You can modify the default color for differences in the File Compare/Merge Options dialog box, accessed from the File Compare/Merge window under Tools > Options .