Fixed bug n°486: on huge images, ECMerge may crash
while comparing
Fixed bug n°487: when regular expression replacement
ends with anti-slash, ECMerge hangs
Windows
Fixed bug n°488: the exclamation point key might be
ignored in some situations
2014-09-30(version 2.5 build 203)
Windows
Fixed bug n°484: redirection to asynchronous pipes
of ECMerge output could fail for huge files
OS X
Implemented new signing policy for
OS X Mavericks and OS X Yosemite
Fixed bug n°485: ECMerge could crash when clicking
web update blinking icon
2014-06-20(version 2.5 build 201)
All platforms
Fixed bug n°482: A bug in German translation file
could prevent ECMerge from saving template and status
files
OS X
Fixed bug n°483: A performance warning might be
shown in console on Mavericks
2014-05-12(version 2.5 build 200)
All platforms
Fixed bug n°481: when a MS Office or OpenOffice
file has a file name with accented characters, it might be
left unconverted by Xtract
2014-03-12(version 2.5 build 199)
Windows
Fixed bug n°480: ECMerge may not run on Windows XP
because of erroneous syntax in DPI awareness
manifest
2014-02-26(version 2.5 build 198)
General
Added support for Git over ssh (via ssh or PuTTY), on
bare Windows we could get PuTTY to work and ssh to work in
Linux/Mac OS X. The plug-in expects UTF-8 encoding
for the accented file names in the Git repository.
Solaris 10 last build will be 2.5.196 for ECMerge 2.5, we
don't plan to support Solaris for ECMerge 3.0, if you
absolutely need ECMerge on Solaris, please contact
us.
Windows
A 64 build is now available, although not
rebuilt every time, drop us an email if you need the
64 bit build
ECMerge is not yet fully DPI aware, so flagged it as
not DPI aware at all to avoid wrong display
OS X
Fixed bug n°476: shortcut were not presented
correctly on OS X Mavericks
Fixed bug n°479: quitting while help is displayed
might not request to save opened documents
Folders
Fixed bug n°477: rare crash when displaying
contextual menu in folder view or comparison
2013-12-18(version 2.5 build 196)
OS X
Digitally signed the application (ECMerge.app) so that it
installs smoothly on Snow Leopard and Mavericks
2013-12-04(version 2.5 build 195)
General
Fixed bug n°473: navigating with TAB in some
options pages could crash ECMerge
Integration
Added OEM integration feature, OEM can now use
serial numbers working only with their respective version of
ECMerge
Text Converter
Fixed bug n°472: Xtract might crash on invalid .doc
file
OS X
Fixed bug n°474: source control mappings creation
might show spurious log messages
Fixed bug n°475: ECMerge might crash in rare
condition when certain combo boxes events were triggered
Unixes
Improvement: ECMerge can now be called on all platforms
as ecmerge.exe and ecmerge-cli.exe (once the installation
path is known)
2013-09-16(version 2.5 build 192)
HTTP
Fixed bug n°471: ECMerge could crash when multiple
sides were set at same time with an HTTP URL
Folders
Now opens APK (Android Applications), JAR (Java Archive),
WAR (Web Archive), EAR (Enterprise Archive) and SAR (Service
Archive) as ZIP files
2013-06-21(version 2.5 build 191)
Documentation
Improved documentation about searching regular expression
and hexadecimal string in binary files
Xtract
Improvements n°470: Xtract now supports some
malformed Word .doc files generated by so called Microsoft
Office compatible software
2013-04-29(version 2.5 build 190)
General
Fixed bug n°469: some wrong regular expression could
crash ECMerge
Binary comparison
When the base used for addresses is hexadecimal, the
status bar shows positions with a 'h' suffix e.g. 358h/8095h
to make it clearer hexa is well used even if the expression
of the position or file size contains no letter.
2013-03-22(version 2.5 build 189)
General
Fixed bug n°467: conversions do not occur as wanted
with decorated file names (such as myfile.odt.r1000)
Changed behaviour of Xtract detection, now the version of
Xtract in ECMerge application folder is always preferred to
any other. This is checked every time ECMerge runs so
that installing in a new folder does not keep using old
converter.
Folders
Fixed bug n°468: when merging, target folder
creation might not be well presented to user
Reports
Added new report option -Xnone, to let the user script
its own reports
Documentation
Fixed various links in BinaryDocument documentation
Windows
Fixed bug n°466: command line might hang when
running comparisons with converters or generating reports
(Windows)
2012-12-17(version 2.5 build 187)
General
Added in How to... Install converters, documenting
new "user-converters" sub-folder where to place
converters to have them detected immediately
Fixed bug n°464: Removing a converter from the
Converters list would not disable the Remove button anymore,
clicking it again could crash ECMerge
Windows
The default installation path does not contain anymore
the accent in Ellié Computing. It solves some problems
with non Western OSes and works around bugs in other
softwares expected to use ECMerge but with defficient support
of Unicode.
Mac
Fixed bug n°465: in a rare condition involving
converters , ECMerge could crash
2012-10-19(version 2.5 build 185-186)
Texts
Improved status bar reporting conflicts: the number
of conflicts is now the number ofremainingconflicts.
Mac
Fixed bug n°460: UI may get stuck after Merge
or Generic copy box where used
Fixed bug n°461: using Save, solve and close button
does not always refresh appropriately the item in the folder
view, though the actual operation occurred correctly
Fixed bug n°462: crash could occur when trying to
drag a button in the flying toolbar
Fixed bug n°463: flying toolbar could show while
hovering the scrollbars, sometimes making scrolling
nonpractical
2012-09-28(version 2.5 build 184)
General
Fixed bugs n°457 and 459, importing old binary types
or creating new file types may crash ECMerge in rare
condition
Folders
Improved comparisons scheduling performance when
thousands of comparison needs to be scheduled at once
2012-09-13(version 2.5 build 183)
Unixes
Use XDG conformant configuration directory on Linux,
Solaris and Mac OS X
Linux
Improved Debian package to avoid a warning on Ubuntu
12
2012-07-30(version 2.5 build 182)
General
Fixed a few typographical errors in German
translation
Fixed Spanish and Italian translation for the Shell
Extensions (Windows, Thunar, Nautilus, Konqueror, Mac
OS X Leopard / Mac OS X Snow Leopard and
later service)
Mac OS X
Fixed bug n°455: on Leopard, Finder might hang until
ECMerge is closed when using Finder extension, and files
might be opened twice
Fixed bug n°452: tabbing order might not be
respected once tabs were dragged
Fixed bug n°453: some Italian and Spanish
translations might crash ECMerge at startup
2012-07-02(version 2.5 build 176-180)
General
A new fly by menu and toolbaris displayed
when hovering conflicts, so that you can solve a conflict
without having to first click or select it. Most common
actions are proposed, the menu contains all the actions as
well.
The Check updates menu sending to the website was
replaced by a dialog box withautomatic detection of newer versions,
proposing in priority the free upgrades in your user
account.
Web
In addition to FTP/S, theSecure Shell FTP protocol (aka SFTP) is also
supported. You can connect using password, private
key or ssh-agent/pageant.
The connection box was extended and can now show the
connection log in case of error.
ActiveX
ECMerge ActiveX now exists as 32 and
64 bits
Support was added for "Secure for scripting", this is done by
disabling all scripting until a host constrained
/ DSA secured serial number or license package was
provided.
Mac OS X
This version relies much more on Cocoanative framework, giving a better look and feel.
Linux
Added aDebian packageandRPM file distribution. ECMerge is
installed with a single click with these methods. The .tbz
archive remains to allow non-admin, user local
installation.
SCC
Perforce "Unicode" mode is now supported (using
perforce-unicode:// URLs)
Improved behaviour with accents on Unixes
and OS X for Subversion
Added a note about garbled accents in Subversion plug-in
on Windows
Improved behaviour of Darcs, Mercurial and Git on Unixes
and OS X.
Added support for "bare" repositories for Git.
Text
Keep orphans / Remove orphansactions
are now supported (in 2 way only as it makes sense only in
this case) by considering as orphans the lines present in a
insertion/deletion conflict.
2012-04-12(version 2.4 build 161)
Bug fixes
Fixed bug n°223 and 448: tooltips might stop showing
randomly
2012-04-03(version 2.4 build 160)
Bug fixes
Fixed bug n°444: modifying proxy authentication
information might crash application
Fixed bug n°445: when a redraw happens while diff
graph are partially set up ECMerge might crash
Fixed bug n°446: when items are sorted by mime-type,
removal might crash ECMerge
Fixed bug n°447: during installation windows shell
extension might cause a 0xC0000147 exception, though
potentially correctly registered
2012-01-09(version 2.4 build 159)
Bug fixes
Fixed bug n°437: folder diff viewer might show wrong
type of object for 'special' file systems objects (links,
devices...) considering them as folders
Fixed bug n°438: when failing to encode text files
content appropriately when saving to FTP, ECMerge might stop
working
Fixed bug n°439: when FTP authentication fails
while loading a binary file, the view might be loaded
incorrectly
Fixed bug n°440: default field in status bar should
always be left aligned
Fixed bug n°441: status bar reports that the image
cannot be scrolled but it is scrolled correctly
Fixed bug n°442: Save and solve works correctly but
the user interface does not report it appropriately in folder
view
2011-11-16(version 2.4 build 158)
Bug fixes
Fixed bug n°424: when folders are not supported by
protocol handler (simple HTTP), filtering does not work
Fixed bug n°428: resolving should not be blocked by
a missing source
Fixed bug n°429: read_number function with on offset
out of range might crash for a file in memory
Fixed bug n°432: searching inside differences might
crash for text and binary views
Fixed bug n°433: when missing source folder is
created as the result of output operations, result is
OK but UI fails to show it
Fixed bug n°434: when a match is found, binary diff
fails to resynchronize correctly other views
ActiveX
It is now possible to gain access to a Document object
created inside ECMerge scripting engine (as a
FHAxMergeDocument object), as well as a SourceDescription (as
a FHAxMergeSource object)
It is now possible to set options which expects a
SourceDescription directly from the options()
member. Use an FHAxMergeSource to do so.
2011-10-05(version 2.4 build 156)
Bug fixes
Fixed bug n°415: when copying small files,
progression might not be reported correctly
Fixed bug n°416: on Mac OS X, the cursor might not
show in binary views
Fixed bug n°417: comparison of archives as binary
might trigger decompression
Fixed bug n°418: Could not generate reports in text
format for Polish
Fixed bug n°419: when opening a ZIP as a folder
comparison from another folder comparison, the ZIP might
be uncompressed several times
Fixed bug n°420: on Windows Vista and 7, shell
extension might work only during the session of installation
and stop working when logging again
Fixed bug n°422: small glitches when drawing
collapsed region exactly aligned with display lines
Fixed bug n°423: Cursor might not show at first
position in second column of binary views
2011-09-30(version 2.4 build 154-155)
General
Toolbars icons now available in small and large size
Most text or combo fields with available validity tests
are now automatically colored in red when they do not comply
(e.g. regular expressions, patterns...) (Windows
only)
Changed the name of executable on Windows to
“ecmerge.exe” and “ecmerge-cli.exe”,
so that "ecmerge" name is used as well on Windows as on
Unixes
Improved ECMerge icon for high resolutions on Windows and
Mac OS X
Text Edition and Merging
Improved find/replace function to avoid cycling in the
document
Added many default file types to ignore easily
comments (ADA, Bash, Batch, C/C++, COBOL, ColdFusion,
Delphi, HTML, INI, InnoSetup, PO, PHP, SmallTalk,
SQL...)
Binary Comparisons
Ellié Computing Merge now displays binary documents
and comparisons
Define specific binary file types based on file
name patterns, in which you will be able to specify
static or dynamic fields to ignore (timestamps, random
blocks, comments initialized by production software...)
Generate accurate comparison statistics on Binary
Comparisons
Fixed bug n°392: ‘open’ menu item in
Launcher would not always work
Fixed bug n°396: equality test and file copy could
be slow on local network with high lag.
Fixed bug n°401: progression could go mad with copy
larger than 4GB
Fixed bug n°412: crash when using empty filter
inside lines AND checking "use lines filter to ignore"
2011-07-04(version 2.3 build 124)
General
Fixed bug n°383: a crash report is displayed when
trying to open the missing file for a named session
Documentation
Help system now supports search highlighting: whenever a
keyword is searched in the help file, the occurences are
highlighted in the presented page (with a yellow
background).
2011-02-17(version 2.3 build 123)
General
Fixed bug n°380/381 with trial, during first
execution some features may not work as expected
Improved Xtract trial when testing comparison of
Microsoft Word, RTF or Open Office text documents
Documented--open-conflictcommand line switch
Images and Binaries
Improvement: return code can now be used in combination
with diff2/diff3 mode to determine if files are
different in quiet mode
Texts
Fixed bug n°374/375: ignoring single lines and lines
covered by a regular expression could interfer
2011-01-04(version 2.3 build 122)
General
Fixed few translations
Folders
Fixed bug n°373: action lisr in copy and merge
dialog may not be refreshed correctly
Improved performance of operations involving thousands of
files or folders
Windows
Implemented workaround to Windows 7 GDI bug, causing
potential memory corruption and crashes.
Implemented workaround to Windows 7 anti crash 'feature',
indeed preventing crash reports from being generated
All executables are now numerically signed to help some
anti-virus trust ECMerge
2010-11-24(version 2.3 build 121)
General
Fixed bug n°370: crash in filters/file types options
panel
Fixed bug n°371: spurious box sometime showing in
--lockedui mode
Fixed bug n°372: Windows Shell Extension would not
always show on 64 bits OS
2010-11-04(version 2.3 build 120)
General
Fixed bugs 365 and 367: selection might not be
really practical after using RE helpers buttons
SVN integration documentation was
improved
Reduced trial box pressure, it is now presented once a
day only or when the trial expired and the application is
blocked
Folders
Fixed bug n°363: generic copy box does not remember
last action
Fixed bug n°369: missing normaliz.dll could provoque
a crash
Images
Fixed bug n°362: trying to open
file.png.merge-left.r768 does not work, file name was not
undecorated prior to matching files extensions
Texts
Improvement: default font should be more practical for
reading code
2010-10-18(version 2.3 build 119)
General
Fixed bug n°360: crash may happen after combination
of wokrspace renaming and removals
Fixed bug n°361: removing currently selected
workspace might not behave as expected
Folders
Fixed bug n°357: mirroring generic copy action
might not remove completely folders with content
Mac OS / Unixes
Fixed bug n°356: fixed script generated in
$(HOME)/bin which might not always work as expected
Windows Specific
Fixed bug n°358: on Windows Vista/7, upgrading the
shell extension worked only if not yet triggered by
explorer.exe
Fixed bug n°359: text insertion helper button might
remove part of the manipulated string unexpectedly on
Windows
2010-10-05(version 2.3 build 118)
General
The menus were reorganized to be more rational and make
actions easier to find
The Launcher now have aSite sectionin which you can store the
settings for your FTP and SCC sites
A problem submitterbox was added which let
you submit a ticket in our support ticket interface
easily
Thestatus barnow displays thecolours legendtogether with the
statistics
Files types and converterswhich arehiddenby the pattern of other file types
and converters are displayed in red in the list, so that you
immediately see that they are not activated, the hiding
patterns are displayed in blue.
Theintegration with the file exploreris now
present on Linux (Nautilus, Konqueror, Thunar)
and Mac OS X (Finder + Service
Menu for Snow Leopard) in addition to
Windows.
A newOpen Conflict Filemenu item
let you open conflict files generated by CVS, SVN,
Perforce, Git, Mercurial, Bazaar and
ECMerge itself. It allows you to
solve those conflicts easily, from the contextual
menu of the file
explorer of your system as well as from within
ECMerge.
The Windows 95, 98, Me, Nt and 2000 platforms are
not supported any more.
Reports
A button is available in HTML and XML export
dialog box to reach immediately Reports option in the
session.
Added a button to browse for the CSS
Folders
When "Scan sub-folders" button is depressed, collapsing
folders unschedules comparison. It lets you "pause"
comparison for those folders.
Images
Two modal buttons were added in the toolbar, you can
choose between "Move image on screen" and "Change images
alignment"
The differentiation mode called "Blank similar" was
renamed "Mask similarities"
Support for loading TGA files
2010-07-12(version 2.2 build 113)
General
Fixed bug n°338: cannot find } characters in normal
text
Fixed bug n°339: in folders replacing with $1.ext
does not work
Fixed bug n°342: renaming a folder might makes it
appear empty, as if deleted
Fixed bug n°348/350: logs might get partially lost
when a great quantity of logs are output at once
Fixed bug n°351: status bar field not always cleaned
correctly
Fixed bug n°352: in image diffs, panel should not be
draggable
Script
Added ability to set default text colour in OptionsSet
(display.unchanged_text_fgcolor)
Fixed bug n°346: FolderDocument.Item ignore member
does not work as documented
2010-05-05(version 2.2 build 112)
General
Added documentation about how to use --sip (in particular
on Windows)
Fixed bug n°324: when ECMerge is run with a script
it should not load default desktop
Fixed bug n°328: javascript documentation
Fixed bug n°329: launcher shown when ECMerge started
in "locked-ui" mode
Fixed bug n°330: on file new diff, button to open
"something" always opens a file by default, even for a folder
diff
Fixed bug n°331: the copy option set button does not
change copied optionset unique id
Fixed bug n°332: when loading problems happen,
is_in_fully_resolved_state might still return true
Fixed bug n°333: cannot save inclusive merge in
GUI
Fixed bug n°336: if a (XML derived) report for Text
or CSV is output to clipboard, it appears as Chinese
chatacters
2010-03-19(version 2.2 build 111)
SCC listings
Fixed bugs about SubVersion, CVS, Perforce,
Mercurial
Added Darcs, GIT and Bazaar plugins. Darcs
2.4 is required, GIT 1.7 is required
Text
Added merge in-line left then right and right then left,
which let you merge at word or character level and select
those combinations of text when a conflict occurs
Added the ability to parameter the markers to be used
when using inclusive merge (line and in-line), inclusing
their presence and their content.
More comparison parameters are now available from the
scripting (including typed.text.comparison.match_...
serie)
Fixed bug n°319: potential crash when applying
patches on text files
Images
Fixed bug n°321: image file types may not be well
open when certain auto-selection conditions happened
ECMerge tested to compare Adobe DNG files as
thumbnails, with the addition of the DNG File type.
Folders
Fixed bug 314: file names with same symbols were not
always associated because of different normalization form of
Unicode
Fixed bug 315: cancelling when pressing Star (*) key to
expand all folders would not terminate rapidly
Xtract
Fixed bug 318: Xtract crash on certain Word
DOC files generated by Office 2010
Added more robust filtering of bad entries returned by
servers to support TypSoft FTP Server
2010-01-28(version 2.2 build 110)
SCC listings
Fixed bug 294: Mercurial and CVS listing of files
inside otherwise empty deep folders hierarchy would not be
listed
Fixed bug 296: trying to obtain file content for files in
deep folder hierarchy could fail with Perforce
Patch Import
Fixed bugs 287 to 290, 292, 298 (including interface
improvements, feature correctness and crash fix)
Unix-based (Linux, Solaris, Mac OS X)
Fixed bug 299 which could cause repeated comparison of
some files
Fixed bug 300 and 301 which could prevent
proper patch application in folders and generation
2010-01-07(version 2.2 build 109)
General
Fixed bugs 274 to 281 and bugs 283 to 286
Fixed documentation about how to ignore lines in
files
Folders
Added right click macro action "Touch"
which set last modification date of all
selected files and folders contents to now
Added right click macro action "Set dates" which let you
set last modification, last access and creation date to a
specified value, for selected files
Scripting
Added function to manipulate file dates from the
scripting (VFS.set_dates) as well as attributes
(VFS.attrib). VFS.attrib handles Windows attributes as
well as traditional Unix modes (as would a chmod
command)
Added function VFS.stat which returns metadata for a file
or directory (a more efficient equivalent to VFS.dir with the
filename specified as filter)
All the dates are now reflected inside VFS.Metadata
structures, you can thus read and use those dates from
scripting
Text
Added the ability to ignore portions of lines when
comparing at line level, the portions of lines can be
expressed as set of columns with descriptions such as
"1-20;55-" or through regular expressions, in that case you
can exclude text matched (or not matched) by the entire
expression or sub-expressions.
Undoing pretty-printing actions generating thousands of
lines is now instant
2009-12-15(version 2.2 build 108)
Fixed bugs n°263 to 273 (including crash on
Mac)
Folders
Non recursive mode was changed into a mode which filters
out sub-folders (-R- command line switch)
2009-11-25(version 2.2 build 107)
Fixed bugs n°251 to 262 (including command line
export parameters, Xtract generating spurious texts,
SCC date field, scripting, translations and potential
freeze)
2009-11-6(version 2.2 build 106)
General
Workspaces can be added and deleted, anonymous sessions
can be deleted or saved as named sessions
Automatic check for software updates is now triggered
later (few days after first usage)
Changed evaluation logic, now based on days of usage and
no more trial serial number is needed
Fixed bug n°248-250
Folders
The message informing that a resolution action had no
effect is now displayed in status bar rather than a box
Folder sessions save more information, including ignored
items and resolution actions
Source Code Control plugin
Added Mercurial plug-in
Unixes & Mac OS X
New scripts "merge.exe" and "guimerge.exe" were added,
they mimic the behaviour of the Windows
executables. Multiplatforms tools using ECMerge can use
those names which are now the same on all platforms.
2009-7-6(version 2.2 build 105)
Translations
Added user provided Brazilian translation
Xtract
Fixed bug n°243: some RTF files could contain
zero bytes which were output to converted text and in turn
caused ECMerge to handle it as binary.
2009-5-29(version 2.2 build 104)
Folders
Generic copy and Write merge result dialogs now have an
"Auto-run unless Shift is pressed" choice, reducing the
number of interactions to get your copies and merges
done.
Fixed bug n°242: after a comparison failure, copying
over or removing a file did not reset error state for that
item
Added File browser preference to specify which browser to
launch to view folders (Nautilus and Konqueror are
auto-detected)
ECMerge can now be installed anywhere, you do not need
root privilege anymore
2009-4-12(version 2.2 build 103)
General
Few samples of command line usage were added in
samples/ sub-directory, for Windows and Unix's-like
(inclunding Mac)
Converters
ZIP files are treated by Xtract in priority now
Xtract handles as ZIP files all the OpenOffice and
MS Office XML formats which are not handled
natively
The built-in plug-in for WinRAR could fail to call
WinRAR correctly, thus not unzipping files of
archives
The error message when conversion fails is now more
useful
Folders
New 'Orphan' buttons (Keep and
Remove) make it
easier to deal with orphans, it was already possible through
"Solve conflicts with typical rules" button, but was not that
easy.
Behaviour of Keep the most recent/oldest file is more now
practical as well
HTTP
The HTTP / HTTPS client of ECMerge can
issue GET command, thus reading and comparing files from
a web server. This feature let the ActiveX control
compare files on the web
All other commands are non-supported yet
Reports
It's now easier to use CSV and Text reports, you
just have to click a menu entry in XML reports panel
(the stylesheet button bears a drop down menu).
2009-3-23(version 2.2 build 102)
Converters
Added Microsoft Word 6, 95, 97, 98, 2000, 2003, 2005,
2007 text conversion to Xtract. Automatic numbers
for paragraphs are not yet extracted.
Fixed bug n°230: could provoque spurious "options
changed in application reference copy of optionsset"
messages
Folders
Fixed bug n°228: generic copy would provoque
recompare even on items skipped because there was nothing to
do for them
Fixed bug n°229: deleting objects then pressing Goto
next/previous diff/conflict could crash the application in
rare cases
Behaviour of Generic Copy was changed to include the
option 'compate metadata' by default, greatly speeding up the
copy press in many cases
Better diagnosis: when files are not copied because
target is locked or should be deleted, a log line showing the
information is listed
Mac OS X
Rosetta emulation cannot cope with 'Wait for end of
application' event in our code, so those features cannot be
tested thoroughly
FTP
Fixed bug n°232/233: would not retry on some
STOR command failure when it should have; improving
reliability of FTP uploads
2009-3-1(version 2.2 build 101)
General
Fixes bug 219 to 222 and 224 to 226
Converters
Added Rich Text Format (RTF) to text conversion to
Xtract. The RTF extractor understands code page
commands and works with Windows, Mac for Western as well
as Eastern languages (Japanese, Korean,
Chinese...)
Xtract now its own serial number handling and obfuscate a
little its output in Limited Demo, Xtract can be licenced
separately from ECMerge.
Added simple converter for Microsoft Excel to
CSV (runs on Windows only with Excel installed)
Scripting
Added support for the 'Document.information' member,
giving access to detected file types, languages... letting
scripts handle files in function of this information.
Added Folder Easy Synchronization macro-command (two
arrows button), which let you set easily options for
comparison and mirroring left to right and vice versa)
Folders
Simplified 'Hide conflicting items' behaviour: resolved
items would be considered is 'initially conflicting' thus
placed in the category. Though you can force identical
item to be 'resolved', thus modifying their hidden
status. Now, the Hide 'identical/different/conflicting'
items rule depends only on comparison status, not any more on
resolution status
2009-2-13(version 2.2 build 92 - 100)
This version brings a reorganization of options together
with several new features:
New EC Xtract converter built-in allow comparison of
ODT, SXW and DOCX files
Options sets are now shared, with a master copy of them
in the application
New "file types" were introduced, they associate
comparison type, editing, formatting and ignorable items to
the file names.
File types and converters are shared amongst all the
options set, unless specifically specified (you can
forcefully isolate the file types and/or converters of an
options set unchecking the "Use shared file
types/converters". Both can be imported and exported
for safety and sharing.
The Launcher was introduced, it allows to quickly restart
comparisons, it handles workspaces (list of tabs to re-open
as they were when the workspace was closed)
New command line options improve integration with SCC as
a differ
Comparisons get a more meaningful title
New alphanumeric with numeric order when appropriate
in folders (e.g file10 comes after file2 though it
is not lexical order)
Sources combo are now all handled at once when pressing
Enter or the Validate buttons
Many new scripting features (pre-compiled macros,
contextual menu integration, shared file types and converters
manipulations, macro settings, toSource support, temporary
files/directories)
Fixes bug between 194 and 217
2008-11-19(version 2.1 build 83)
Scripting
Fixed bug n°188: MergeRulesSet object did not have
right prototype
Fixed bug n°189: set_state("start") would not
follow the specification given in the documentation (setting
start actually moves end)
Fixed bug n°190: couple badly initialized in
LineDifferences collection would cause wrong length (often
0)
Fixed bug n°191: querying length of in-line
differences collection when there is none crashed
Fixed bug n°192: navigate(position) would not
actually ensure visibility
Fixed bug n°193: crash when calling certain script
function after applying a patch within a folder
2008-11-03(version 2.1 build 82)
General
Fixed bug n°182: error in documentation (misleading
indication about --mode=merge3)
Fixed bug n°183: swap to 3-way after opening a 2-way
ECMT crashes
Fixed bug n°187: error message still truncated in
some conditions
Folders
Fixed bug n°186: bug in comparison scheduling order
gives (very) deceptive time evaluation, while comparison time
is not altered itself
Source code control plugin
Fixed bug n°185: presence of non ASCII characters in
path could prevent auto-checkout feature
Unix based OSs (Linux, Mac, Solaris)
Fixed bug n°184: listing directories with broken
symbolic links fails with error File not found
2008-8-25(version 2.1 build 81)
General
Fixed bug n°178: when opening a graphical difference
from command line, the first view 'result' pane may have
inappropriate height
Fixed bug n°179: Image Comparisons/Colors panel
position was not top/left as others.
FTP:
Fixed bug n°180: message 'unknown PASV reply' could
show, when simply retrying does work
2008-8-8(version 2.1 build 80)
General
Added new automatic multi-user activation for system
administrators (seeMulti-user
activation)
Fixed Bug n°174: error message in blank 'empty view'
not always high enough to show entire message
Scripting
Added new macros toolbars and default shortcuts, it is
now even easier to customize ECMerge
"script_url" is now available during macro scripts
execution
Folders
Fixed Bug n°176: folders date precision too tight
may prevent the "Compensate filesystem precision loss" from
working
2008-7-1(version 2.1 build 79)
General
Fixed bug n°172: Open again/similar box would not
always take new option set into account
Scripting
Fixed bug n°167: FolderDocument.get_item did not
work straight after "new Document"
Patching
Fixed bug n°162: in Unix unified patches, the "\ No
new line at end of file" notation was not parsed
correctly
Fixed bug n°165: application of 'normal' format
patches may fail with "Warning: source should be missing and
is present"
Fixed bug n°166: patches between files with no dates
had no date in header which results in patches not easily
parsable by other tools
Fixed bug n°169: for patch import help ID is wrong,
though the help page exists
Text
Added PO Files colorization
Fixed bug n°170: language recognition with filename
fails for contextualized names (i.e. with
;id=value)
Folders
Changed behaviour of default action in folder view
(triggered by double-click or enter key), now if any folder
is selected, the default action is to toggle the expansion at
one level, else it is to open the selected files (as
differences in differentiation or merge mode and as simple
editor for the browser)
Added "Refresh" for selection only, which is particularly
handy when comparing very large collections of files/folders
and you know that only a few directories need to be listed
again
Fixed bug n°159: dragging from icon in folder view
did not work
Fixed bug n°160: could not parse some FTP
listings
Fixed bug n°161: changing run-time parameters in
folder diff view should not reset files
comparisons
Fixed bug n°164: dragging to copy may not work as
expected
Fixed bug n°168: right click menu Open Diff As
sub-items were not disabled in browser
Mac OS X
Fixed bug n°163: "Save" box for new files wants
a dot at end of file name
Fixed bug n°171: image viewer could not activate
right click menu on Mac when Left click+Ctrl is used to
simulate right click
2008-5-26(version 2.1 build 78)
General
Changed startup options handling: now --default is
accepted but ignored and new flag --factory was introduced.
--factory requires factory settings to be used for the
document initially loaded and ensures that the run is
independent from local machine/user settings.
Added --log-to which let logs be written to any URL
(currently FTP/FTPS or local) in addition to their normal
target (standard error and log window). Users can now get
errors log in a common way on whichever platform they run
Ellié Computing Merge.
Added --app-settings-file and
--app-settings-file-read-only options. --app-settings-file
let you specify a particular location on local disk to
load/save the settings file, this is particularly useful for
bundlers who can save Ellié Computing Merge settings in
their own settings directory this way.
--app-settings-file-read-only prevents writing to the
settings file.
Scripting
Added System.Console object which let scripts read lines
of text from standard input and write text to standard output
and error streams. This is practical to parameter your
scripts with list of files, or to display your results based
on Ellié Computing Merge comparison structures. With the
quiet flag activated, you get only your own output.
Folders
Fixed bug n°154: Problems could occur when using
filename filtering options
Mac OS X
Fixed bug n°155: language list not sorted on
mac
Fixed bug n°157: Typing Apple-Y when there is
nothing more to Redo types Y
Fixed bug n°158: Sometimes changing columns width in
Folders view could crash
2008-3-19(version 2.1 builds 77)
General
The --serial-number command line flag was mistakenly
documented as --serial.
The member 'document_type' of Document.Parameters was
mistakenly document as 'object_type'.
Command line
Fixed bug n°152: --serial-number parameter was taken
into account later than necessary in some situations
When --cli or --quiet was used, a default document was
still generated as in normal GUI , it could be unpractical
and was removed
2008-3-11(version 2.1 builds 76)
General
Added on option which lets a bounding process run
Ellié Computing Merge with a provided serial number
(--serial="licence-key"), allowing bundling of Ellié
Computing Merge to be totally independent from the installed
version and its configuration
Texts
Fixed: Writing inclusive merge result in 2 way would not
put markers around second side on conflict
Default 'Save' action on close now saves the result, no
more an ECMS/ECMT.
Folders
Running folders in GUI mode from command line disables
--lockedui mode
New options (include/exclude patterns) available from the
OptionsSet objects
Fixed double question for: 'File write protected, do you
want to check it out?'
Scripting
Added System.Process and System.Synchronization
hierarchies to run process and wait for their
termination
Added "properties" member to URL and parameter to new URL
letting all the advanced options be used from scripting
(multi-connection, SCC branches/labels browsing,
encryption flags...)
Windows
Added an option to let the user choose between saving the
settings in the "local settings" section or in the normal
roaming section of the user profile.
2007-12-17(version 2.1 builds 75)
General
Fixed bug n°149 introduced by fix of bug n°145
in 2.1.74 (swapping left/right after reducing from 3 to
2 could cause strange behaviours)
Fixed bug n°151: running in --sip or --lockedui mode
could sometime cause a crash at startup
Windows
Fixed bug n°148 with Vista /
certain roaming user profiles configurations
Linux
Fixed bug which could provoque data loss in particular
in-place overwriting situations
Scripting
Added is_in_fully_solved_state function on Document
object
Added --pdl-script and --pdl-script-text command line
options
Fixed bug n°147: scripting totally empty selection
could cause troubles
Documentation
Documented Application.script_url variable, already
available since first 2.1
Fixed a few typos
2007-12-03(version 2.1 builds 74)
General
Fixes bug n°145 which could occur when using the
"Swap between 2 and 3-way comparisons" button
Editor / Texts
Fixes bug n°143 which would show the Copy/Cut icons
as disabled whereas they worked
Fixes bug n°146 (number of non-blank characters
between inline changes might be ignored)
Folders
Fixes bug n°144 which let a trailing path separator
in folders name when entered in combobox
Scripting
Added new function RegExp.execBackward which has the same
specification as RegExp.exec but searches backward for the
regular expression
2007-10-26(version 2.1 builds 73)
General
Fixed logging overflow: when an extremely large list of
log entries was output in a short time, these entries could
be chopped off arbitrarily (due to text control
limitations)
Scripting
Fixed undefined metadata in browser
Fixed missing argument check in
FolderDocument.Item.get_url( )
Improved parsing errors reports
Windows
Fixed menus images in front of items with shortcuts; they
would disappear
Unixes
Fixed crash occuring when GTK 2 in version 11 at least
was installed
2007-10-08(version 2.1 builds 64 to 72)
These versions fix few bugs discovered during the beta
cycle.
General
SCC interface for Code Co-op (only checkout)
New --watch-merge command line option
Scripting
More macros available for image and folder views
New Application object members (initial_document,
executable_path, ui_language)
Text
Fixed a bug occurring at save time: undo stack could
actually coalesce more actions than expected together; making
undo difficult to use.
Folders
New path based filtering
Platforms
Added Mac OS X x86 platform
2007-07-26 (version 2.1 build 63)
This version contains 5 new major features, and many
improvements:
Source Code Controls You need to install the command line tools for that
SCC. Generally you will not need any specific configuration
thanks to auto-detection fonctionality.
On Windows, we support CVS (1.11 and before, 1.12 and
after), SubVersion, ionForge Evolution, Perforce, VSS. On Unices, we support CVS (1.11 and before, 1.12
and after), SubVersion, Perforce
Browsing You can now browse the content of several source code
controls repositories.
Checking files out You can also check files out for those SCC for which
it is natural.
This system is extensible and adding a new SCC is
generally easy. Please contact us if you would like to have
another SCC supported.
Scripting and User Macros An ECMAScript compatible scripting engine is now
included in Ellié Computing Merge. It lets you run
comparisons, synchronizations, retrieve statistics, produce
reports, script the text editor, the views... 40 dedicated
objects are available to script the comparisons, hundreds of
settings were made available: all the power of Ellié
Computing Merge at hand!
Unix Patch Import You can now apply Unix patches within Ellié
Computing Merge. More importantly you can preview the
application before saving. Single and multi files patches are
supported, together with files deletion semantics, fuzzy
matching...
Keyboard Shortcuts The keyboard shortcuts for any menu item can be
changed. New shortcuts can be added for user macros, or
commands which prove to be used often. You can re-assign
existing shortcuts toyourpreferred commands rather than ours!
Full featured command line The command line is able to run differentiations and
merges directly for files and folders. Run on a
differentiation, it will now export a textual report to the
standard output by default. It is able to run scripts as
well. The command line now also returns a meaningful value
all the time (when run for merge).
General
Greatly improved search and replace features: Ellié
Computing Merge can now search for regular expressions
(both for text and file names), replace all matches in
selection, searching within differences. Folders can rename
multiple files at a time using regular expressions and
replacement patterns.
Added (optional) tips on startup, it can help you get
more of Ellié Computing Merge.
Added 'simulate' question to run a simulation of the
merge operations (use --yes=simulate to activate it during
initial operations)
Added 'inclusive-merge' question to allow saving
merged files with conflicts using the inclusive merge (use
--yes=inclusive-merge to activate it during initial
operations)
Added many descriptive flags for converters and made
activation more flexible (through scripting), added
auto-detection built-in script. Installing a converter is
then just matter of asking us a detection scripting and
pressing a button.
Fixed bug of 2.0: refreshing would not re-apply
filters
Fixed bug of 2.0: extensions fields to force comparison
of a given type where not always well reloaded to the
panels while well applied
Fixed bug of 2.0: focus was not given to find combo field
but to the find box itself, which was not practical
Installer
Improved installer : keep the installation language for
latter execution
Documented unattended installation
Folders
The Generic Copy feature now copies items in parallel (it
uses as much connections as available). It makes SCC copies
and/or SCC to FTP deployment very efficient.
A Check-out menu item was added
View and Edit menu items have been merged into View which
actually runs View if the file is read-only and Edit if it is
read-write.
Improved the combo boxes MRUs so that they do not keep in
mind URL to temporary location (when using folders
filters)
Fixed a bug of 2.0 which could cause a crash in
particular run conditions
Texts
Typing in a View-only file proposes now to unlock it, if
it is under a SCC Mapping, it proposes to check it out.
Added option to insert spaces when pressing TAB key
Fixed a bug of 2.0 which could provoque data loss when
using a sequence of edition such as: Open, Edit, Save [,
edit, save...], Swap to read-only, Swap to read-write,
Save.
Reports
Large numbers are now displayed better (with a thousands'
separator)
Unix patches are now more compatible when
handling missing files
2007-01-25 (version 2.0 build
54)
Folders
Fixed an error writing results, which could happen when
using auto-merge
Linux
Added documentation to explain how to remove Ellié
Computing Merge with only two commands
2007-01-02 (version 2.0 build
53)
General
Fixed editing source combo then clicking browse button
combination, the latest edition was ignored
Improved Help Window, keeping font and other
settings
Folders View
Tooltip on file name is now made of the entire path
Recursive removal now handles better read-only
files and does not enter any more symbolic links to
folders
Text Comparisons
Fixed a problem when reloading ECMS files: in certain
conditions, "Inconsistency found" message would be
displayed.
Windows specific
Fixed launch parameters in Windows Explorer extension,
the factory settings were used rather than the default
settings
Fixed Unicode file name handling in Windows Explorer
extension, now a Unicode build is deployed on
WinNT/2K/XP/Vista
2006-11-22(version 2.0 build 51)
General
Fixed Folder font options
Text Editor
Fixed Shift-F3 backward find, would go forward after some
searches
Fixed Shift-F7 Previous Difference, would jump some
differences
Text Comparison
Added "Resolve with" documented shortcuts to the
Right-Click Menu and to the toolbar's tool
FTP
Fixed: rename function would fail silently
Fixed: browsing top folder of servers with an entry
path
2006-11-15(version 2.0 build 50)
General
Improved the rendering of output location selectors icons
(when disabled)
Improved notebook design (add close button to the tab,
navigation arrows)
ImprovedWindows Listdialog box (handle double-click to
activate, del/backspace to close), added a shortcut to get
it
Improved application icons
Dropping a file system item on the empty or error view
opens this item in the panel
When swapping between 2 way and 3 way differentiation,
the ancestor source is remembered
German and Italian translations
Fixed: (Under Win9x only), dragging files from a
folder view cause a wrong drop (filenames are split at each
character)
Fixed: When starting a drag, the selection is sometimes
reset to a single item near the start of the drag
Fixed: Multithreaded comparison scheduler is not stopped
during copy operations, and may interfer during file
loading
Fixed: Win9x/Me have very tight GDI limits preventing
more than approximately 18 diffs or 90 editors, using more
than these numbers may crash. The application implement a
hard limit (12 views)
Text Editor
Added Auto-Indent
Text Comparisons
Enabled word wrapping in differences (making comparisons
of long lines more practical)
Improved line synchronization in heavily modified text
files differentiations
Folder Browser / Comparisons
Copy / Paste to the sources combos work and keep all the
connection parameters
Added "Select Bookmarked Items" menu item
Added a warning limit when opening numerous views from a
Folder
Added comparison re-scheduling code which favours
currently viewed items
Plus, minus and star key now operate on the entire
selection, rather than the current item
FTP
Fixed FTP anonymous mode (was handled as no
login/password)
Fixed FTP URL display in XML/HTML reports
2006-10-24(version 2.0 build 45Beta)
General
Configuration file now uses a new name each time forward
compatibility is not insured (allowing parallel
installations)
New FTP / FTP over SSL connectivity
Active / Passive connections
FTP over SSL (using AUTH TLS/SSL or using implicit SSL
connections)
Comparisons are done very efficiently (on large sets of
small files Ellié Computing Merge goes much faster than
several of our concurrents by using multiple parallel
connections, and the "numerous small files" case is the
common case with web sites)
A log view can be enabled to show you the potential
connection problems
Various options allow you to use anynomous login,
passwords, SSL certificate authentication, server
authentication
Folder Comparisons
Added grouping of folders (optional, to Top or
Bottom)
Added sort by any column (name, size, MIME type,
differences count)
New filtering options in 3-way mode (excluding file which
are unchanged only at left/right, this is very practical to
show a subset of what one co-worker only changed)
Case sensitiveness of file names comparison is now an
option
Right click menu Open commands have been improved,
drag'n'drop as well
Text Comparisons
New in-line merge features helping resolution of
Change/Change conflicts
Image Comparisons
Supports web formats (PNG, GIF, JPG), plus many others
(BMP, XPM, TIFF...)
Several differentiation algorithms (Blank similar which
overlays two images and blanks similar areas, Difference
which shows directly arithmetic colours components
difference, accumulated or chanel per chanel)
Zoom, stretch and alignment
Reports
New image XML and HTML report, differences and thumbnails
and images are generated as PNG (all of them are
optional), metrics are output in XML/HTML (PSNR / MSE,
exact/similar/different pixels count)
User Interface
Much more toolbar options are now available. Toolbars can
be dragged, docked and hidden.
New "Document Type" combo allows you to switch document
type dynamically for given sources (for example, to compare
binarily text or images, or compare text source of XPM
images)
Output locations selectors (glasses/database write arrow
icons at the right of source selection Browse Menus) replace
previous Select as Output Location menu item, as well the
Selection Output Location dialog box and option panel
Can now jump from View/Edit mode to Comparison mode by
pressing 2/3 button in the toolbar
Accelerated various boxes and Views closure
2006-09-07(version 1.2 build 34)
General
Text editor would always ask for new file name when
saving a file opened from MRU combo
Added dynamic language handling. Simply adding a
directory with a language code and the right files inside it
(lg.xml, report.xsl and .po files) will show new language in
Language / Application box. If you want to translate Merge,
please contact us, we will give you explanation and material
to easily translate the software. We can give free licences
to translators
Renamed "File Comparisons" into "Text Comparisons" in
order to prepare for other types of differentiations
Improved memory footprint of the statistical engine as
well as its speed
Fixed some translations
Improved documentation
Simplified Licence
Folder Comparisons
Default comparison option is now set back to "Check files
content if date or size are different"
Fixed problem stopping idle comparisons
Fixed crash when using backward find on fully empty
differentiation
Text Comparisons
Fixed crash in XML Filter on some mal-formed XML
XML Filter defaults were changed from "All tags" to "Tags
with no spaces", which should have been the default (because
it gives far better results)
Reports
Fixed bug in binary file report using monochrome
rendering
Fixed bug generating simple binary reports from command
line
Fixed bug preventing report generation when using
relative paths from command line
Fixed bug in folder reports forcing column widths to
inappropriate values
Fixed bug preventing generation of Unix Patch sub-reports
in HTML/XML mode
Fixed least/most recent icon background bug in IE
Added explanation on how to print HTML reports from IE,
Mozilla, Netscape with best rendering
Added new details within the files differences statistics
in folders report
Added explanation about last Changes Count column in
folders report
Added information about changes inside conflicts for text
files, making it easier to evaluate the actual time to solve
these conflicts
Added new option "Format lines in a single column for
identical parts" , this new option is activated by
default
Added information about actual loading encoding for
files
Changed HTML reports graphical design to follow
Ellié website
Reduced the size of generated HTML reports (up to 30% in
common cases, theoretically up to 70%)
2006-06-21(version 1.2 build 33)
General
Fixed a wrong message when it is not possible to Unlock a
file (make it writable)
Fixed a crash when trying to use Open again... menu
item
Used a better size for date/hour controls in Options
panel
Improved the rendering of some UI elements (buttons,
live-update for splitters...)
Improved drag'n'drop (dropping 2 or more files on combo
is handled as in the top level frame, can drag'n'drop a
sub-folder in a folder view to replace the root of
differentiation without having to press Control key)
Linux
When dropping several files, the UI would not ask if they
are to be compared or opened individually
Solaris 10 x86
First release for this platform, installable as a
standard SunOs package
2006-06-14(version 1.2 build 32)
General
Fixed a regression bug when trying to open a binary
comparison from command line
Fixed a regression bug when using the "Fill from
clipboard" menu item in text mode
Fixed a regression bug when reloading folders documents
(particular actions could provoque "Document not recognized"
error)
Added handling for 32 new encodings on Windows (ISCII,
Chinese, Japanese...)
Improved the behaviour of the software when it is not
possible to make a backup file prior to saving (text
views)
Fixed a visual bug in time field of "Filter by date"
panel
Improved transitional memory overhead when loading large
text files or pasting large texts
Added link in demo/test welcome screen to check if a
newer version of the soft exists
Linux
Renaming a file or folder in folder view would overwrite
target file without confirmation
2006-06-07(version 1.2 build 31)
General
Fixed display problem in Text Comparisons HTML report
generation: now constrains the files contents display to the
screen width even with very long lines of text making the
reports suitable for printing
Improved rendering of monochrome reports
Fixed Ctrl+TAB view navigation on Linux
View navigation gives focus to last used source
Searched text is now selected when opening Find
box
Default action in Folder view is now to Open Diff is
diff mode, Merge in merge mode (rather than always Diff)
Added shortcut for Delete (Shift+Delete key) in Folder
view
"Set text output options" is now always available for
Folder (even in Diff mode) to allow converting Generic
Copy
Markers, ignored items and resolutions actions in Folder
view are kept in more situations making a document easier to
re-use
Templates and status files
Fixed a bug preventing reload of certain ancient ECM?
files
Fixed a bug which discarded markers and ignored items at
save time in rare conditions
Linux
Default installation now works out-of-the-box in most
Linux systems (kernels 2.4 / 2.6)
Added a "Web browser" command line in the Commands panel
of the Application Options. This command line is used as a
fallback, if the system settings to launch a web browser
cannot be found or used.
2006-05-29(version 1.2 build 30)
General
Ellié Computing Merge is now multi-threaded, for a
better resource usage on new Dual Core and multi-processors
computers
Converters Files can now be preprocessed by user-defined
converters. This allows to export PDF/Word files to plain
text, or ZIP archives to folders.
Reports Patch, XML and HTML reports can be generated on both
File and Folder Comparisons. Many customizable options.
Define recurrent comparisons as .ecmt files and generate
merge reports periodically. Reports in Folder Comparisons can
be generated on the whole hierarchy, or on the
selected/bookmarked items.
Comparisons statistics Displays a dialog box with the summary of the
comparison: number of changed, unchanged, inserted, removed,
ignored items. Comparisons statistics in Folder Comparisons
can be generated on the whole hierarchy, or on the
selected/bookmared items.
Options sets Define several sets of options you often use for Text
or Folder Comparisons (comparison options, filters,
converters, display). When opening a new comparison, you can
select which set of options to use for it.
Find feature change Ellié Computing Merge now finds the same text in
all opened documents.
Pure command line application On Windows, a pure command line executable is delivered
to be used in batches. On Unix, an argument can be specified
to force pure command line behaviour.
Spanish translation
Folder Comparisons
Filters by date Specify some date-based criteria to hide files and
exclude them from the comparison
More filters by status Capability to hide files or folders present or missing
in any of the hierarchies. Capability to hide all folders
that do not contain any visible files.
Show/hide hidden files and folders Files and folders that were excluded from the
comparison (regarding Name/Status/Date criteria) can be
displayed in the Folder Comparison view, using the colour
assigned to "ignored" items.
More comparison heuristics Ellié Computing Merge now handles more
heuristics to apply on files, so as to determine whether
they are equal or not regarding the specified criteria (based
on date and/or size information). When these heuristics do
not determine the file status, Ellié Computing Merge
will perform a content comparison.
Time zone adjustment Capability to set an offset for any of the folders
hierarchies.
Generic Copy from one source to another Ellié Computing Merge opens a dialog box to
test/perform a copy action from one folder hierarchy to
another one. This dialog box shows how many file/folder
creation, deletion or copy will occur. The user can
choose not to do some of the predetermined operations.
Write merge result confirmation box equivalent feature to the "Generic Copy", when writing
Folder Merge result.
User Interface
Comparison views can now be displayed horizontally or
vertically
Folder Comparisons specific display options: ancestor and right hierarchies indentation is now
optional (only in vertical display), the date column can display an icon to show the
newest/oldest file, or the date text, added a column with the number of differences between
files.
2006-03-23(version 1.1 build 27)
General
fixes a problem in the text editor
2006-02-02(version 1.1 build 25)
General
added a "limited demonstration" behaviour when no
evaluation serial number is entered
the software now exists as two editions (Standard and
Professional)
better encodings handling at loading and saving time.
Each file/folder defined as source or result of a merge can
have its own encoding. For folder merges, a default encoding
can be specified so that created files are automatically
converted when written (useful when synchronizing folders
hierarchies with different encodings).
better line endings handling at saving time. You can now
force a line ending character to be used when writing a file
(useful when synchronizing folders hierarchies on different
systems using different text line delimiters).
fixed various bugs
Text Comparisons
in-line differences, at word and/or character level
XML pretty-printing and compacting functions to display
properly XML files
User Interface
dynamic loading of files and folders for comparisons and
merges. You can now open an empty window for comparing and
merging files and folders, and then, specify which item to
use as left, ancestor or right source. You can also fill a
text source from the clipboard.
added options corresponding to XML pretty-print/compact
and in-line differences features
all Options-like dialog boxes now remember the last
section displayed when dismissing the window, so that it is
reopened on the same section.
added some keyboard shortcuts for many commands
(open options dialog boxes, navigate in differences and
conflicts, ...)
in a Text Comparison view, the comparison summary is
displayed in the status bar
improved speed of application when switching from a Text
Comparison view to a Folder view
added a contextual menu in Text Merge view to solve
conflicts contained (even partially) in selected text.
2005-12-12(version 1.0 build 22)
General
fixed various bugs
Comparisons Views
improved speed drawing and navigation in Folders
Comparison view
User Interface
reduced flickering when opening a new document (new
tab)
2005-12-04(version 1.0 build 21)
General
port to Linux
port to Windows NT4 (SP6)
Windows Explorer context menu integration
French translation
syntax colouring for several languages
added ability to keep doc options when opening
again/similar
Folder Comparisons
improved "open external viewer"
Comparisons Views
improved synchronization between views
User Interface
fixed bug which prevented from showing the right default
font when re-opening font dialog
added a dialog box (list of Windows) with the list of
currently opened documents, to save/close some of them and/or
activate one of them
changed control for encodings list in "Options" dialog
box
added control to change the Ellié Computing Merge
user interface language
added a dialog box (Languages) to select the favourite
languages, and change the language colouring to apply to the
current text document.
added help button in serial number splash screen
2005-10-31(Beta RC3)
General
improved file loading, keeping the original encoding if
the UTF Byte order mark (BOM) was found
fixed a bug preventing from opening sub-folders in
non-recursive folder views
Folder Comparisons
fixed a bug preventing writing of the full folder as soon
as a conflict existed
Text editor
optimized text editor speed
User Interface
added right-click on notebook tabs allowing easier
'close'
added "Get Serial Number" hyperlink in splash screen at
application start up
fixed bug in Document Options dialog (result location
browse button always opened a folder selection
dialog)
and
Remove
) make it
easier to deal with orphans, it was already possible through
"Solve conflicts with typical rules" button, but was not that
easy.