The tables below summarize the major features in the two versions ( Standard and Professional) of Ellié Computing Merge.
The major difference between the Pro version and the Standard version, is that Pro version adds 3-way related features (automatic merge being the most important).
General
Feature | Standard version | Professional version |
View/Edit
Text Files
Open a text file window with basic edition capabilities. |
|
|
Text Comparison
See table below for details. |
|
|
Image Comparison
See table below for details |
|
|
Folder Comparison
See table below for details. |
|
|
Options
sets
Options sets keep your settings in a safe place you can reuse them later easily |
|
|
Templates / status documents
Template and status allow you to export all the parameters to generate reports from command line or to start repeated tasks. They can also be opened again to change some settings or to work interactively in the graphical interface. |
|
|
SCC /
Version control Browsing and
Check-out
|
|
|
Reports in UNIX
patch, XML and HTML formats
Generate reports of files (text, image, binary files) and folder comparisons. A folder comparison report can optionnaly include sub-reports for text, binary files and images comparisons, as embedded reports or as independant files. |
|
|
UNIX
Patch Import
Apply directly or preview patches to see how they alter your text files or folders. |
|
|
Tabs
view
Open multiple files or folders comparison windows. |
|
|
Drag'n'drop enabled
Drag'n'drop a file or folder over the combo at the top of a view and this item gets compared automatically. Drag 2 or 3 items on the application window and a new comparison opens them for comparison instantly. Drag files and folders between panels to launch Generic copies |
|
|
Unicode and
MBCS Support
Display, edit, compare and merge Unicode or MBCS encoded text files. Many Windows specific code-pages are also supported. |
|
|
Side-by-side
differences and result view
Display files side-by-side with linking lines. The result merged file is displayed below. |
|
|
Hideable
ancestor item
Show or hide the ancestor item to suit your preferences or needs. |
|
|
Jump
to previous/next difference or conflict
Quickly navigate between differences and conflicts in a file using the toolbar or keyboard shortcuts. |
|
|
Fly by toolbar and menu
|
![]() |
![]() |
Converters
Customizable applications to be used to preprocess files before opening them (in both text editor and comparison views). |
|
|
Powerful
scripting
|
|
|
Integration
with Configuration Management systems
Define Ellié Computing Merge as the default Diff or Merge tool to use in source code control (SCC) or software configuration management (SCM) solutions. |
|
|
FTP / SFTP
|
|
|
Command
line
Call Ellié Computing Merge from other applications (SCC/SCM) or use it as batch (for periodical reports generation). |
|
|
Customize
user interface
Change the font face/size and the comparison colours for both screen display and HTML reports. |
|
|
Keyboards
shorcuts /
Customizable
shortcuts
Control Ellié Computing Merge using the keyboard. You can define your own shortcuts to match your needs. |
|
|
Display
line endings characters
Display line terminators as CR and LF characters to see differences between files produced on different operating systems. |
|
|
Bookmarks
Record the cursor position and return to it whenever you need. Bookmarks shape and colours are customizable. Bookmarks are available in both Text Files and Folders Comparisons. |
|
|
Go to
line
Move to a specific line number in a document. |
|
|
Go to
offset
Move to a specific position in a document. |
![]() |
![]() |
Find/Replace
Usual Find/Replace feature for Text files. Find files by name in Folders Comparisons. Find text or data in Binary Comparisons. |
|
|
Line
Numbering
A hideable margin contains the line number in text files. |
|
|
Feature | Standard version | Professional version |
Two-way
comparison and merging
Display inserted, removed and changed lines and blocks between two text files (source code, HTML/XML/CSS documents, web pages or another text format). |
|
|
Three-way
comparison and merging
Merge your changes and those of your co-workers based on a common ancestor into one copy. |
|
|
In-line
differences
Displays the differences inside a line (at word or character level). |
|
|
XML
Pretty printing / Compaction
Greatly improves the quality of the differentiation for XML files. |
|
|
Security
area
The security area prevents automatic merges of modification in left and right files with respect to the ancestor, if these modifications are nearer than a limit that you specify. |
|
|
Ignoring
particular changes
Allows you to ignore particular changes (for example, lines automatically generated by an SCC tool such as $Id: marker or context lines of .po translation files). Ignored changes are skipped by the previous/next difference and hidden in the File Difference overview, showing you only the differences that you consider important. |
|
|
Take
ignored changes text from specified file
Different options allow you to ignore changes, however these changes are not necessarily totally insignificant, this option allows you to take the ignored portions from a specified file. It proves to be particularly useful when you ignored white spaces at start of lines for example. |
|
|
File
overview graphs
Allows very quick navigation within text files. Presents a quick overview of the number of differences between compared files. |
|
|
Changes
linking lines
The relations between changed text blocks are displayed as graphical links between the two involved versions. |
|
|
Synchronized
scrolling
Vertical scrolling of any text file keeps the matching blocks in front of each other. |
|
|
Save/Restore
comparison status
Save a comparison at any time and reload it later, preserving all your work. |
|
|
Conflict
Highlighting
Conflicting blocks of text in the files are flagged with a conflict marker for manual resolution. You can navigate between conflicts (all or only unresolved) using toolbar icons and shortcut keys. |
|
|
Conflict
Markers
If displayed, the margin shows a customizable marker in front of conflicts. |
|
|
Ignore
whitespaces options
Whitespace differences can be considered as unimportant. Ellié Computing Merge can ignore leading, embedded and trailing whitespaces. |
|
|
Ignore
Line Endings option
Differences in line ending characters can be considered as unimportant. Allows you to compare and merge files produced on different operating systems. |
|
|
Compare
clipboard content
Fill easily the views from the text copied into the clipboard |
|
|
Feature | Standard version | Professional version |
Many
file formats
Open GIF, BMP, JPG, PNG, TIFF, XPM... natively and use converters to view many other file formats |
|
|
Parameterable differentiation
|
|
|
Zooming, stretching, alignmentWhen the images are not of the same size or one is a detail of the other, align and stretch it easily with the tools or right click menu |
|
|
Several
measures
Compute PSNR and MSE, in addition to exact/similar and different pixels count |
|
|
Compare
clipboard content
Fill easily the views from the text copied into the clipboard |
|
|
Feature | Standard version | Professional version |
Two-way comparison
Display inserted, removed and changed blocks between two binary files. |
|
|
Three-way comparison
Check any difference between two files based on a common ancestor. |
|
|
Ignoring
particular changes
Allows you to define static or dynamic fields in the binary file formats and ignore some of them (for example, timestamps). Ignored changes are skipped by the previous/next difference, showing you only the differences that you consider important. |
|
|
Folding
Compress large blocks of data. |
|
|
Synchronized scrolling
Vertical scrolling of any binary file keeps the matching blocks in front of each other. |
|
|
Save/Restore comparison status
Save a comparison at any time and reload it later, preserving all your work. |
|
|
Bookmarks
If displayed, the margin shows a customizable marker. In Binary documents, bookmarks are linked to a specific position. |
|
|
Compare
clipboard content
Fill easily the views from the data copied into the clipboard |
|
|
Feature | Standard version | Professional version |
Two-way
comparison and merging
Display file insertions, removals and changes between two folder hierarchies. You can compare branches of source code, entire web sites or other sets of text and binary files. |
|
|
Three-way
comparison and merging
Merge changes between two folder hierarchies and a common ancestor. Use it to merge branches in a source code control (SCC) or software configuration management (SCM) solutions. |
|
|
Integrated
file comparison
Compare and merge differences between files from the folder hierarchies comparison view. |
|
|
Filters
Define critera to include or not files or folders in the Folder Comparison. Excluded files are not displayed unless "hidden files" are wished. |
|
|
Mix
Unicode files with native encoding files
Ellié Computing Merge can be used to compare folders with mixed encoding thanks to its Unicode auto-detection algorithm (even without signatures). |
|
|
Compare folders of different encodings
Specify one default encoding per folder hierarchy, enable or disable Unicode auto-detection |
|
|
Right
click summary
With a single right-click you get a comparison summary for the selected items |
|
|
Multi-threaded background comparisons
Ellié Computing Merge can compare documents in background and multi-threaded! Take advantage of new double cores or multi-processor systems. You can stop the comparisons at any time and restart them later if you need your CPU for something more urgent. Ellié Computing Merge gives a slightly lower priority to these comparison to give you the best user experience. |
|
|
Drag'n'drop
/ Cut'n'paste copy
You can drag'n'drop or cut'n'paste files and folders from a panel to another and easily launch the Generic Copy dialog box |
|
|
Generic /
Filtered copy
The Generic copy box allows you to copy/mirror easily a subset of the files from a side to another. A comprehensive interface allows to simulate what would happen. You can permit many different actions by type and realize exactly the wanted task (e.g. Overwrite older, Overwrite newer, Create new files, Create new folders...) |
|
|
Rename
You can rename items in-place or in the Item properties box |
|
|
Item
properties box
View item properties (size, last update...). |
|
|
Time
adjustments
Use time adjustments to cope with servers which do handle time zones by themselves |
|
|
Free Compare
Launches comparisons between any 2 files or folders or 3 files or folders with Pro version |
|
|
See also