The content window shows the folders you have selected to compare or merge in a multi-column tree. Colors identify the differences between files and which files are included in the target folder and patterns identify conflicts. You can customize these colors and patterns, for details see page 513Setting Colors.
If you are merging folders, the target has the same folder and file structure as the ancestor. In addition, if Auto Merge is enabled, the target contains all files from the derivatives that are not in conflict with the ancestor. You enable Auto Merge in the Options dialog box.
A bold folder name indicates that its contents have been modified. A bold filename indicates the following:
In a derivative or target, the file differs from the ancestor.
In the ancestor, the file differs from one or more derivatives.
Related Topics