SlickEdit User Guide

TOOLS
The Ellipses buttons to the right of the text boxes are used to select files. The B buttons to the right of the
text boxes are used to select from the open buffers.
The list below describes the remaining fields and settings:
• Base file - Specifies the file/buffer name of the original source file before any changes are made.
• Revision 1 and 2 - Specifies the file/buffer names of the modified versions of the base file.
• Output file - Specifies the output file name.
• Merge style - The following merge styles are available:
o Auto merge - If selected, if a change does not cause a conflict, the change is automatically
applied to the output file and no indication is made that the change was already applied.
o Show changes - If selected, if a change does not cause a conflict, the change is automatically
applied to the output file and the change IS indicated, so that using the Next Conflict button
will show you the change.
• Output style - Output style has no effect if there are no conflicts. The following output styles are
available:
o Interactive - Provides a friendly side-by-side dialog box which lets you pick the change you
want in the output file. It also lets you edit.
o Interleaved buffer - Creates an editor buffer which you must edit to resolve conflicts.
• Use smart merge - If selected, the number of conflicts found is reduced.
SlickEdit® User Guide 611