About Identifying the Differences.

A system of colors and patterns helps you identify the differences between the lines in the ancestor and target, and which lines have been selected for inclusion in the target.

You can customize these using the Colors tab of the Configuration dialog box. The following table shows the defaults.

This background

Indicates this

addition_selected.gif 

Selected addition. This object is included in the target.

change_selected.gif 

Selected modification. This line is included in the target.

deletion_selected.gif 

Selected deletions. This line is excluded from the target.

addition_unselected.gif 

Unselected additions. This line is excluded from the target.

change_unselected.gif 

Unselected modification. This line is excluded from the target.

deletion_unselected.gif 

Unselected deletions. This line is included in the target.

conflict.gif 

Conflict. This line conflicts with the corresponding line in other derivatives.

resolved_conflict.gif 

Resolved Conflict. This line is a conflict that you have already resolved.

padded.gif 

Padded. This is a blank entry inserted to align the corresponding rows between different content windows.

selected_color.gif 

Highlighted. This is the line to which the current operation will apply.

Related Topics

About Starting the Merge Tool

About the Main Window

About the Content Windows