| Package | Description | 
|---|---|
| org.eclipse.emf.compare.merge | 
| Modifier and Type | Method and Description | 
|---|---|
| protected DelegatingMerger | ConflictMerger. getMergerDelegate(Diff diff) | 
| protected DelegatingMerger | AbstractMerger. getMergerDelegate(Diff diff)Find the best merger for diff and wrap it in a delegate that will take the current merge criterion into
 account. | 
| static DelegatingMerger | AbstractMerger. getMergerDelegate(Diff diff,
                 IMerger.Registry2 registry,
                 IMergeCriterion criterion)Find the best merger for diff and wrap it in a delegate that will take the given merge criterion into
 account. | 
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.