Merging Files

Edit Mode

Compare It! can work in edit or read-only mode. To switch from edit to read-only mode, press F9 or use the Edit Mode toolbar button.

Differences-Based Editing

While Compare It! has an internal editor, which is powerful enough to do most simple editing, you will rarely need it, because you can do differences-based editing. This type of editing will help you to copy blocks of changes from one file to another with a single mouse click or a key stroke.

To copy differences to the source or target pane:

• Use the ALT + LEFT ARROW / ALT + RIGHT ARROW keys or toolbar buttons.
  -or-
  Select the Copy command from the popup menu.
  -or-
  Click the appropriate icon in the MergeBar.

To copy a single changed line:

• Use the CTRL + ALT + LEFT ARROW / CTRL + ALT + RIGHT ARROW keys or toolbar buttons.

To add a changed block of lines to the second file:

• To insert the block after the current section, hold down the CTRL key and click the appropriate icon in the MergeBar.
  -or-
  To insert the block before the current section, hold down the SHIFT key and click the appropriate icon in the MergeBar.

To copy a changed block of lines to the clipboard:

• Right-click or press SHIFT + F10 to display the context menu, then click Copy Diff.

Replacing Files

Sometimes, after viewing changes you may decide to keep just one file instead of merging them.

To replace the target (right) file:

1. Select the target file by clicking in the target pane.
2. Choose File > Replace right file.
   A confirmation dialog box appears. This dialog box provides you with the full path and file name information about the file you are about to overwrite.
3. To replace the target file and close Compare It!, click Yes.
   -or-
   To replace the target file and leave Compare It! open, click No.
   -or-
   To cancel the replace operation, click Cancel.

To replace the source (left) file:

1. Select the source file by clicking in the source pane.
2. Choose File > Replace left file.
   A confirmation dialog box appears. This dialog box provides you with the full path and file name information about the file you are about to overwrite.
3. To replace the source file and close Compare It!, click Yes.
   -or-
   To replace the source file and leave Compare It! open, click No.
   -or-
   To cancel the replace operation, click Cancel.

Rescanning Files

After you have made changes, you can rescan files to minimize confusing areas.

To rescan files:

• Press F5.
  -or-
  Choose View > Rescan.
  -or-
  Click the Rescan button on the toolbar.

© 1996-2010, Grig Software, All Rights Reserved