Public

Release 2.0.131.0

Dec 01 2018
Bug

The 'run text diff' action in the 'parsing errors found' dialog did not work fine when semanticmerge was launched through the version control system. Fixed.

Public

Release 2.0.130.0

Oct 25 2018
New

Improved the parser for the C++ language to handle the conditional directives as container declarations.

Public

Release 2.0.129.0

Oct 15 2018
Bug

Java 10 wasn't recognized as a valid JVM version, which prevented our Java and C++ parsers to work. We fixed how the Java version is checked, so it should work smoothly now!

Bug

There were some corner cases that caused using/import declarations to be placed at the end of the file or after type declarations. We fixed our merge algorithm so it automatically groups that kind of declarations to prevent them from being scattered all over the document.

Public

Release 2.0.127.0

May 25 2018
New

We have updated our EULA in the installer to ensure that we are ready for the General Data Protection Regulation (GDPR).

Bug

"An item with the same key has already been added" exception was thrown when there was a renamed - renamed conflict for a container declaration with changes in the destination contributor. Fixed.

Bug

The integrated Java and C++ parsers did not work with Java 9. Fixed.

Bug

The XMerge feature of the regular text-based mergetool was not working as expected due to a missing library (Svg.dll). Fixed.

Now the required library is bundled in windows installer.

Bug

SemanticMerge showed the license notification through the "Get License" button when the license is an auto-renewal one. Fixed.

Public

Release 2.0.122.0

Apr 09 2018
New

A warning dialog will be shown on startup when one or more files cannot be parsed. This way we allow users to run the associated text-based tool.

Remark: There is a "--nostructurewarn" flag to skip showing this dialog and directly launch the tool. That option can be also applied as a persistent setting in the configuration window -> "general" tab.

Bug

The differences were not correctly calculated when an option related to the file content was changed (e.g. reformat source code, encoding). Fixed.