Control panel (two-file merge)

(Tools > Merge Files... ; fill in File1 and File2, and click Merge.)


This dialog box allows you to control the merge. The Editor pauses at each difference it finds, and waits for you to tell it what to do.

The panel contains the following buttons:

Skip

The Editor finds the next difference.

Help

Invokes help on the control panel.

Cancel

Aborts the merge, closing all merger windows.

File1

Copies the selected text from File1.

File2

Copies the selected text from File2.

Both

The first time you press this button, a dialog box appears asking you how you want to merge the two selections: in what order, with change bars around them, with comments in front, between, or after them, and so forth. The next time you press this button, the last values entered are used.

Change Bars...

Changes the way the All button works, and opens the same dialog box as the first time you press the All button.\

Edit...

This performs the same action as 1,2, but then allows you to modify the changes in a temporary editor before merging them into the new file.

Automatic

Enables or disables the automatic merge feature.


Previous

Next



Copyright © 1999, Green Hills Software. All rights reserved.