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 |
|
Selected addition. This object is included in the target. |
|
Selected modification. This line is included in the target. |
|
Selected deletions. This line is excluded from the target. |
|
Unselected additions. This line is excluded from the target. |
|
Unselected modification. This line is excluded from the target. |
|
Unselected deletions. This line is included in the target. |
|
Conflict. This line conflicts with the corresponding line in other derivatives. |
|
Resolved Conflict. This line is a conflict that you have already resolved. |
|
Padded. This is a blank entry inserted to align the corresponding rows between different content windows. |
|
Highlighted. This is the line to which the current operation will apply. |
Related Topics