Public

Release 2.0.149.0

Oct 02 2019
New

Some semantic merge users suggested that they were not clear about the next action to perform in order to resolve a merge. We decided to blink the buttons to resolve a conflict, so the next action to perform is clear.

New

In order to enable Java and C++ files to be semantically merged, it is required a valid installation of Java Virtual Machine (version >= 8).

But, if no valid Java Virtual Machine is found, SemanticMerge will warn the user asking whether falling back to regular, embedded text-based mergetool (a.k.a. XMerge tool) or cancel the execution.

If you use the "--nojvmwarn" argument, SemanticMerge will automatically fallback to the text-based mergetool without asking. This behavior can also be configured in the SemanticMerge preferences.