Editing the Output File

To edit the output file, you would move the pointer into the output file's text pane and place it in the line you want to change. In this example, the following line was typed in:

>>> This line edited by hand <<<

You would choose Edit > Mark Selected as Resolved. This menu item marks the difference as resolved. In this example there are no more unresolved differences, so the next difference remains the current one.

The message in the upper left part of the window now indicates that all differences have been resolved. Nevertheless, you would proceed to verify the automerged differences.

You could continue to navigate through the differences by clicking the down arrow.

The final difference results from a line that was added only to file_2. Merging would place the new line in the output file just as it did when a new line was added to file_1, which resulted in the third difference.