Control panel (three-file merge)

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


This dialog box allows you to control the merge. If the automatic feature is turned off, then you can control the entire merge. If the automatic feature is turned on, then you only control the merge of conflicting changes with this window. 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.

All

Copies the selected text from all three files. The first time you press this, or any of the next three buttons, a button dialog box appears asking you how to merge the selection: 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, it uses the last values entered.

1,2

Merges the selections from File1 and File2.

1,Base

This is identical to 1,2 except it merges the selections from File1 and the base file.

2,Base

This is identical to 1,2 except it merges the selections from File2 and the base file.

Change Bars...

Changes the way 1,2, 1,Base, 2,Base, and All buttons work, and brings up the same dialog box as the first time you press any of those buttons.

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

This is a toggle button and allows you to turn on (an X appears in the box) and off (the box is empty) the automatic merge feature.


Previous

Next



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