| Package | Description | 
|---|---|
| org.eclipse.emf.compare.merge | 
| Modifier and Type | Class and Description | 
|---|---|
| class  | AttributeChangeMergerThis specific implementation of  AbstractMergerwill be used to merge attribute changes. | 
| class  | ConflictMergerThis specific implementation of  AbstractMergerwill be used to merge real conflicts. | 
| class  | FeatureMapChangeMergerThis specific implementation of  AbstractMergerwill be used to merge attribute changes. | 
| class  | PseudoConflictMergerA simple merger for pseudo conflict. | 
| class  | ReferenceChangeMergerThis specific implementation of  AbstractMergerwill be used to merge reference changes. | 
| class  | ResourceAttachmentChangeMergerThis specific implementation of  AbstractMergerwill be used to merge resource attachment changes. | 
| class  | ResourceLocationChangeMergerDeprecated. 
 ResourceLocationChanges have been replaced byResourceAttachmentChanges of kind Move. | 
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.