New features in Ellié Computing Merge 2.5
Merging with a single click and mostly wihout moving the cursor is possible thanks to the toolbar and menu flying by the current conflict. ECMerge places in this toolbar most appropriate actions.
ECMerge can compare the folders shared through SFTP (SSH FTP). ECMerge supports password authentication as well as private key and can integrate with ssh-agent or pageant (the key manager for putty). Of course, you can update and compare an SFTP site as you wish (with other folders connected through whichever protocol).
The latest ActiveX version of ECMerge now supports systems with the data execution prevention enabled (NX flag). It supports all the features of the standalone version. It integrates to your application, your scripts or web site thanks to the ActiveX technology. It can e.g. generate a patch between two strings of text and obtain the result as a string as well, all of that with or without user interface.
The installation process under Linux exists now in three flavours: a Debian package, a RPM file and the compressed archive. The Debian package is typically installed in a single clic once downloaded on a machine with Debian, Ubuntu... The RPM files are more suited to Fedora and RedHat. Of course, there is still the compressed archive to install in your own user directory for more flexibility.
ECMerge can now compare binary files. It presents differences in clear manner, its speed is impressing and it can collapse long portions of equal sequence of bytes. As with text files, it is possible to ignore portions of files to avoid spurious differences between build timestamps or random filling data for example. Read more...
Resolving the conflicts let behind by CVS, Subversion or Mercurial (complete list) is not a really practical task: text markers and special notations are inserted to keep track of the conflicts and it is easy to miss one of them. ECMerge completely releaves that pain by parsing these markers and presenting a usual two or three-way merge view, you can then solves the conflicts within the comfort of ECMerge powerful interface! More info...
ECMerge allows you to access the content of your Git repository, either local in your work directory or in "bare" repository and as well via SSH (always bare repostory in this case). The access "Git over SSH" requires PuTTY on Windows and ssh on OS X and Linux to realize the authentication.
You can access any commit per hexadécimal code, date, label and branch. The folders can be listed and the files content read. Your repository must encode accents in UTF-8.
ECMerge can be used from Git to compare and merge code source, and compare images, binary or office text documents.
From the launcher, you can register the addresses for your favorite sites, then reuse them with a double-clic or drag'n'drop.