Package | Description |
---|---|
org.eclipse.emf.compare.ide.ui.internal.logical |
Modifier and Type | Method and Description |
---|---|
protected void |
AdditiveResourceMappingMerger.delegateMergeOfUnmergedResourcesAndMarkDiffsAsMerged(SynchronizationModel syncModel,
org.eclipse.team.core.mapping.IMergeContext mergeContext,
EMFResourceMappingMerger.ResourceAdditionAndDeletionTracker resourceTracker,
org.eclipse.core.runtime.SubMonitor subMonitor) |
protected void |
EMFResourceMappingMerger.delegateMergeOfUnmergedResourcesAndMarkDiffsAsMerged(SynchronizationModel syncModel,
org.eclipse.team.core.mapping.IMergeContext mergeContext,
EMFResourceMappingMerger.ResourceAdditionAndDeletionTracker resourceTracker,
org.eclipse.core.runtime.SubMonitor subMonitor)
Delegates the merge of so far non-merged resource additions and deletions and marks all other already
merged resources as merged.
|
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.