Resolving Differences

A difference is represented by a blank line in the merged (output) file in the lower text pane. To resolve a difference, you edit the line displayed there by either:

• Accepting the line displayed and incorporating it into the merged file by clicking either the Accept or Accept & Next button over the pane you wish to accept

• Editing the line in the merged file by hand, and marking the difference as resolved by choosing Edit > Mark Selected as Resolved