Previous/Next change buttons Use these buttons to jump quickly between each change in the files. Linking lines The linking lines connect corresponding parts of the files, showing exactly how they are related. This enables you to easily pinpoint inserts, removals or changes even in long lines of text. Notice that only the changed text within the line is highlighted. You can change the font and colours used for blocks of changed text in the Options dialog. The linking lines show the related block of text in the other file. Block of changed text and in-line highlighting This block of text is different in the two files. The Explorer context menu for the file is also available from this menu. Context menu (not shown) Right-click either file panel to display a context menu containing shortcuts to useful commands. Insertion point A thin vertical line indicates where within the line text has been inserted in the other file. Edit marker These show you whether a line has been edited or copied from another 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. Inserted block of text This block of text is present only in the right-hand file. Centre point marker Merge tries to keep matching parts of the files aligned with this centre point marker as you scroll vertically.ġ6. You can click on the overview strip to jump directly to particular change. Each colour-coded mark on the strip represents a difference. Overview strip This gives you an immediate idea of the extent of the differences between the files being compared. The file comparison automatically updates as you make changes. In-place editing You can edit either file directly in-place. However, it is possible to omit some of the unchanged text to avoid showing irrelevant information. Omitted lines indicator By default, Merge shows all unchanged lines of text. Comments can be added to bookmarks, and are included when you save a comparison (perhaps for archiving or sharing with colleagues) and also in HTML comparison reports. Bookmark You can set bookmarks in a file to help keep track of important locations as you are editing. Hold down Ctrl while scrolling to prevent this and only scroll one file. Vertical scrollbar As you scroll one file, the other is automatically scrolled to keep matching parts of the two files visible. Hold Ctrl+ Shift and click to delete a block of text. Hold down Ctrl while clicking to insert instead of replacing. Merging button Click a merging button to copy a block of text to the other file, replacing any corresponding block. The connecting lines show you exactly where the text would have to be inserted in the right file to make the two files identical. Removed block of text This block of text is present only in the left-hand file. 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. Note that editing is disabled by default in read-only files, but can be enabled if desired. The right icon indicates that the file has been edited or modified since the comparison was first performed. Read-only files may only be edited if you have configured Merge to allow this. Read-only and file modified indicators The left icon Indicates that a file is read-only. Tab strip The tab strip lets you switch quickly between different file comparisons if you have several open at once. Three-way comparison button(Professional Edition only) Click this button to change to a three-way file comparison view. Automatic merge to common ancestor 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. HTML reports are particularly useful for archiving and distribution. Report button Click this button to create a report of the file comparison in HTML, HTML slideshow, XML or UNIX diff format. Other buttons on this quick access toolbar enable text, binary and image comparisons to be launched with a single click. Folder comparison windows let you compare and synchronize entire folder hierarchies. Folder comparison button on quick access toolbar Click this button to launch a folder comparison window. Merge has a traditional menu/toolbar interface on older versions of Windows.ġ. The screenshot shows the ribbon user interface that is supported only on newer versions of Windows.The Professional Edition of Merge also supports three-way comparison and merging. Only two-way comparison/merging is shown.Important file comparison/merging features are indicated in the image and accompanying explanatory text below.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |