Package | Description |
---|---|
org.eclipse.emf.compare.merge |
Modifier and Type | Class and Description |
---|---|
class |
AdditiveConflictMerger
This specific implementation of
AbstractMerger will be used to merge conflicts in an additive merge
context. |
class |
AdditiveReferenceChangeMerger
This specific implementation of
AbstractMerger will be used to merge reference changes in an
additive merge context. |
class |
AdditiveResourceAttachmentChangeMerger
This specific implementation of
AbstractMerger will be used to merge resource attachment changes in
an additive merge context. |
class |
AttributeChangeMerger
This specific implementation of
AbstractMerger will be used to merge attribute changes. |
class |
ConflictMerger
This specific implementation of
AbstractMerger will be used to merge real conflicts. |
class |
FeatureMapChangeMerger
This specific implementation of
AbstractMerger will be used to merge attribute changes. |
class |
PseudoConflictMerger
A simple merger for pseudo conflict.
|
class |
ReferenceChangeMerger
This specific implementation of
AbstractMerger will be used to merge reference changes. |
class |
ResourceAttachmentChangeMerger
This specific implementation of
AbstractMerger will be used to merge resource attachment changes. |
class |
ResourceLocationChangeMerger
Deprecated.
ResourceLocationChange s have been replaced by
ResourceAttachmentChange s of kind Move. |
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.