Toolbar items may vary regarding the currently active document. There is one set of tools for text document view/edition, and another set for comparison and merging.
New in 2.0: You can now move the
toolbars and hide them. Ellié Computing Merge stores the
toolbars position and visibility within the configuration. You
can reset the toolbar settings to default by right clicking on
any toolbar and selecting "
Reset Toolbars".
Ellié Computing
Merge 2.3: More toolbars are now defined and
toolbar visibilty is activated based on the current
document type.
|
|
|
|
|
|
The following table lists the comands you may see in the toolbar.
Icon | Command | Description |
![]() |
Show / Hide launcher | Show or Hide the launcher window. This allows you to directly re-open a workspace, or a previous document/comparison. |
![]() |
New Text Comparison | Opens a new Text files Comparison document |
![]() |
New Image Comparison | Opens a new Image Comparison document |
![]() |
New Binary Comparison | Opens a new Binary Comparison document |
![]() |
New Folder Comparison | Opens a new Folder Comparison document |
![]() |
Save | Saves the output file for the current comparison view. |
![]() |
Save, solve conflict and close |
Saves the current text comparison, marks the
conflict as solved in the original folder comparison
and closes the text document comparison view.
|
![]() |
Close | Closes the current view. |
![]() |
Refresh |
Refreshes the current folder comparison view.
|
![]() |
Allow comparisons of files content in background |
When this button is toggled, pending files content
comparisons are processed at idle time (when your
computer almost does nothing else). You can press this
button to disable files content comparisons if you
wish. These will be done when needed (when navigating
into a folder where files status are not yet defined
because waiting on the result of the content
comparison).
|
![]() |
Scan sub-folders |
This button is toggled only when you allow
sub-directory listing (
more
infos). Sub-folders listing are processed as a
background task. You can suspend this action by
pressing the button.
|
![]() |
Write to results | In the main toolbar, it will write all pending actions for the folder view. In the contextual menu or Actions menu, it operates on the selection. |
![]() |
Exit | Closes the application. |
![]() |
Undo | Undoes the last operation (text typing or conflict resolution). |
![]() |
Redo | Does again the last undone operation. |
![]() |
Cut | Cuts the selection from the active document to the clipboard. |
![]() |
Copy | Copies the select from the active document onto the clipboard. |
![]() |
Paste | Pastes the current contents of the clipboard into the active document. |
![]() |
Find | Opens the Find dialog box |
![]() |
Find Next | Moves the cursor to the next matching text in the current file. |
![]() |
Find Previous | Moves the cursor to the previous matching text in the current file. |
![]() |
Replace | Opens the Replace dialog box |
![]() |
Toogle Bookmark | Toogles a bookmark on the current line. |
![]() |
Next Bookmark | Moves the cursor on the next bookmark. |
![]() |
Previous Bookmark | Moves the cursor on the previous bookmark. |
![]() |
Clear all Bookmarks | Removes all bookmarks. |
![]() |
Previous difference | Moves the cursor on the previous difference. |
![]() |
Next difference | Moves the cursor on the next difference. |
![]() |
Previous conflict | Moves the cursor on the previous conflict. |
![]() |
Next conflict | Moves the cursor on the next conflict. |
![]() |
Previous unresolved conflict | Moves the cursor on the previous unresolved conflict. |
![]() |
Next unresolved conflict | Moves the cursor on the next unresolved conflict. |
![]() |
Resolve with left | Resolves the conflicts contained in selection with data comming from the left view. |
![]() |
Resolve with ancestor | Resolves the conflicts contained in selection with data comming from the ancestor item. |
![]() |
Resolve with right | Resolves the conflicts contained in selection with data comming from the right view. |
![]() |
Resolve with left then right | Resolves the conflicts contained in selection with data comming from the left view and adds the data comming from the right view. |
![]() |
Resolve with right then left | Resolves the conflicts contained in selection with data comming from the right view and adds the data comming from the left view. |
![]() |
Resolve with left and right in-line | Resolves the conflicts contained in selection by merging at in-line level (mixing text comming from left/ancestor/right views). |
![]() |
Keep orphans | Resolves the conflicts contained in selection and which are for orphan data by choosing to keep the data |
![]() |
Remove orphans | Resolves the conflicts contained in selection and which are for orphan data by choosing to remove the data |
![]() |
Solve by merging files |
Resolves the conflicts for selected items by
launching a merge operation for each of them.
|
![]() |
Keep the most recent file |
Resolves the conflicts for selected items by keeping
the most recent version of each file.
|
![]() |
Keep the oldest file |
Resolves the conflicts for selected items by keeping
the oldest version of each file.
|
![]() |
Unresolve | Unresolves the current conflict. |
![]() |
Solve selected items with typical rules |
Opens the "Apply merge rules..." dialog box to apply
specific rules to solve selected items.
|
![]() |
Arrange the panels horizontally/vertically |
Splits the active window horizontally or vertically.
This enables you to compare files or folders
side-by-side or stacked vertically.
|
![]() |
Show/hide ancestor for diff/merge | Toggle the button on and off to show or hide the ancestor pane. This option is available only when the ancestor is known. |
![]() |
Swap between view/edit mode
Swap between diff/merge mode |
In a Text editor, toggle this button to
enable/disable edition.
|
![]() |
Swap between 2-way and 3-way Comparisons | Remove/Add the ancestor panel from the Comparison algorithm. This option is different from "Show/Hide ancestor", as it only hides/shows the ancestor, but the ancestor data source is still considered as present for the comparison. |
![]() |
Change current document options | Opens the
Options dialog
box to edit the current document options.
![]() |
![]() |
Edit application options | Opens the Options dialog box to edit all the application options, including the document options that will be used to open new documents. |
![]() |
Move image on screen | Modal button. When this mode is enabled on an Image view, clicking and dragging moves the image on screen |
![]() |
Change images alignment | Modal button. When this mode is enabled on an Image Difference view, clicking and dragging changes the alignment of the two compared image relatively to each other. |
![]() |
Stretch to match |
Enlarge the images in current document to match
the largest or smallest one (in both height and
width directions).
|
![]() |
Stretch to match width | Enlarge the images in current document to match the width of the largest or smallest one. |
![]() |
Stretch to match heigth | Enlarge the images in current document to match the height of the largest or smallest one. |
![]() |
Zoom in | Increases the magnification of the image (original images and differences) |
![]() |
Zoom out | Decreases the magnification of the image (original images and differences) |
![]() |
Normal viewing | Reset the global zoom factor to 1 for
all the images
![]() |