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. |
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.