| Package | Description | 
|---|---|
| org.eclipse.emf.compare.merge | 
| Modifier and Type | Class and Description | 
|---|---|
| class  | AdditiveConflictMergerThis specific implementation of  AbstractMergerwill be used to merge conflicts in an additive merge
 context. | 
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.