Instant Overview of File Comparison and Merging

1. Revisions (Time Machine) button

Click this button to open any earlier revision of the current file stored by Time Machine. Open the same file in both the left and right comparison panes, then use this button to compare a file with an earlier revision of itself.

2. Three-way merge button (Professional Edition only)

Click this toolbar button to change to a three-way file comparison view.

3. Automatic merge button (Professional Edition only)

Click this button to merge automatically non-conflicting changes from the left and right files into the centre common ancestor file of a three-way comparison.

4. Linking lines

The linking lines connect corresponding parts of the files, showing exactly how they are related.

5. Removed block of text

This block of text is present only in the left-hand file. The connecting lines show you exactly where the text would have to be inserted in the right file to make the two files identical.

6. Removed text indicator

A thin vertical line indicates where within the line text has been inserted in the other file.

7. Inserted block of text

This block of text is present only in the right-hand file. The connecting lines show you exactly where the text would have to be inserted in the left file to make the two files identical.

8. Block of changed text and in-line highlighting

This block of text is different in the two files. The linking lines show the related block of text in the other file. You can change the font and colours used for blocks of changed text in the Options dialog.

Notice that only the changed text within the line is highlighted. This enables you to easily pinpoint inserts, removals or changes even in long lines of text.

9. Vertical scrollbar

As you scroll one file, the other is automatically scrolled to keep matching parts of the two files visible. Hold down Ctrl while scrolling to prevent this and only scroll one file.

10. Previous/Next change buttons

Use these buttons to jump quickly between each change in the files.

11. In-place editing

You can edit either file directly in-place. The file comparison automatically updates as you make changes.

12. Merging button

Click a merging button to copy a block of text to the other file, replacing any corresponding block. Hold down Option or Cmd while clicking to insert instead of replacing. Hold Option+Cmd and click to delete a block of text.

13. Edit marker

These show you whether a line has been edited or copied from another file.

14. Move the linking lines panel

Drag the linking lines panel left or right from here to change the relative widths of the file comparison panes. Double click to re-centre.

15. Centre point marker

Merge tries to keep matching parts of the files aligned with this centre point marker as you scroll vertically.

16. Omitted lines indicator

By default, Merge shows all unchanged lines of text. However, it is possible to omit some of the unchanged text, in which case an indication is shown stating the number of lines that have been hidden.

17. Bookmark

You can set bookmarks in a file to help keep track of important locations as you are editing. Comments can also be added to bookmarks; these are included in saved file comparisons or HTML comparison reports, helping you to communicate with colleagues.

18. Overview strip

This gives you an immediate idea of the extent of the differences between the files being compared. Each colour-coded mark on the strip represents a difference. You can click on the overview strip to jump directly to particular change.

19. File modified and read-only indicators

The upper, red, icon lights to indicate that the file has been edited or modified since the comparison was first performed. Note that editing is disabled by default in read-only files, but can be enabled if desired.

The lower, yellow, icon lights to indicate that a file is read-only. Read-only files may only be edited if you have configured Merge to allow this.

20. Context menu

Right-click either file panel to display a context menu containing shortcuts to useful commands. The Explorer context menu for the file is also available from this menu.

21. Status bar (including change summary)

The status bar shows the character encoding of the currently selected file and a count of the changes between the files.