Diff-Merge icons

The Diff-Merge toolbar icons

The following icons are found in the Diff-Merge toolbar:

· , which is used to launch the semi-automatic merge mode, used to resolve non-ambiguous differences, starting from the current difference

· , which is used to launch the automatic merge mode, used to resolve all differences automatically

· , which is used to undo the last action carried out

· , which is used to switch on or off removable consistency checks

· , which is used to check the consistency of the selected object in the resulting model

Diff-Merge representation icons

The following icons are used in the model explorers, to graphically represent modifications which have been made to a model:

· , which signifies that an element has been added to the model

· , which signifies that an element has been moved within a relationship

· , which signifies that an element has been moved into a new relationship

· , which signifies that an element has been deleted from the model which is facing the model which contains this icon

· , which signifies that the element in question has attributes whose value has changed between the two models

· , which signifies that the icon normally used to represent the element has not been found