public interface IMergeAllNonConflictingRunnable
| Modifier and Type | Method and Description | 
|---|---|
| Iterable<Diff> | merge(Comparison comparison,
     boolean leftToRight,
     IMerger.Registry mergerRegistry)Merges all non-conflicting differences from the given comparison in either direction. | 
Iterable<Diff> merge(Comparison comparison, boolean leftToRight, IMerger.Registry mergerRegistry)
comparison - The comparison which differences we are to merge.leftToRight - Direction of the merge operation.mergerRegistry - The registry to query for the appropriate merger for each difference.
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.