About the Content Window

The content window shows the folders you have selected to compare or merge in a multi-column tree.

Colors help you identify the differences between files and which files are included in the target folder. The following table shows the default colors.

This color	Indicates this
	Selected addition. This object is included in the target.
	Selected modification. This object is included in the target.
	Selected deletion. This object is excluded from the target.
	Selected move or rename. This object is included in the target.
	Unselected addition. This object is excluded from the target.
	Unselected modification. This object is excluded from the target.
	Unselected deletions. This object is included in the target.
	Unselected move or rename. This change is excluded from the target.
	Unresolved conflicts of an indeterminate type. This shows only in the target.
	Original location of a file or folder that has been moved. (This cannot be selected for inclusion in the target.)

Patterns help you identify conflicts. The following table shows the default patterns:

This pattern	Indicates this
	There is a conflict.
	The conflict is resolved.

In the Options dialog box, you can customize these colors and patterns.

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.

The following table shows icons that you see in the content window.

This icon	Indicates this
	New folder
	Deleted folder
	Unmodified file
	New file in the target
	New file in the derivative
	Deleted file
	Modified file
	Moved/renamed folder’s original location/name
	Moved/renamed folder’s new location/name
	Moved file’s original location/name
	Moved/renamed file’s new location/name
	Moved/renamed and modified file
	Unresolved difference in the target
	Object in a derivative that has a timestamp previous to the same object in the ancestor
	Selected object included in the target