#Online diffmerge license#

These radio buttons have an impact on the 'Modifiable' check boxes. 'Merge direction' radio buttons specify the direction of the merge, i.e., which model is the source of changes and to which model the changes can be applied. This is a way to protect a model against accidental changes due to a wrong usage of the tool. If a check box is unselected, it will not be possible to carry out merge actions which would modify the corresponding model. 'Modifiable' check boxes allow defining which model(s) can be modified. 'up-and-down-arrows' button on the right can be used to swap the position of models - left or right - in the tool, for convenience.

Setup dialog involving the selected files is shown. It can also be used on model-based diagrams (GMF files, or Sirius *.aird files for example) or model fragments. This menu item is enabled when two model files are selected in the Project Explorer as illustrated in the figure below. The GUI is accessible via the 'Compare With' - 'Each Other as models' popup menu item. Other technological usages of EMF Diff/Merge as well as complementary technical documentation are available online on the The GUI supports setting up and configuring comparisons, visualizing differences and selectively merging those differences. This document explains how users can use the GUI to compare and merge models manually. Typical usages include model refactoring, iterative model transformations, bridges between models or modeling tools, collaborative modeling environments, or integration with Version Control Systems.Ī GUI is also provided for a classical usage within Eclipse. Its main purpose is to help build higher-level tools that need to merge models based on consistency rules. A handle to a setValue function is passed as an argument to be used to initialize the editor.Ĭlears the editor contents for the specified side.EMF Diff/Merge is a diff/merge technology for models. A handle to a setValue function is passed as an argument to be used to initialize the editor.Ī callback to indicate that Mergely has finished initializing and is loaded.Ī callback to indicate that the container window has been resized.Ī callback that allows the value of the right-hand editor to be set on initialization synchronously.

Enabling wrapping will wrap text to fit the editors.Ī callback that allows the value of the left-hand editor to be set on initialization synchronously. Enabling the viewport can give a performance gain for large documents.Įnables/disables line wrapping. Disabling can give a performance gain for large documents.Įnables/disables the viewport. Possible values: right, left.Įnables/disables sidebar markers. The CodeMirror settings (see CodeMirror) for the right-hand side editor. The timeout, after a resize, before Mergely auto-resizes. The CodeMirror settings (see CodeMirror) for the left-hand side editor. Enabling line numbers will toggle the visibility of the line number margins.

#Online diffmerge license#

Valid values are: lgpl, gpl, mpl or lgpl-separate-notice, gpl-separate-notice, mpl-separate-notice (the license requirements are met in a separate notice file).Įnables/disables line numbers. The choice of license to use with Mergely. Disabling can give a performance gain for large documents. cd current delection).Įnables/disables LCS computation for paragraphs (word-by-word changes). The value a is additions, c changes, d deletions, and the prefix c indicates current/active change (e.g.

The foreground color that mergely marks changes with on the canvas.