org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict

Interfaces

• CustomConflictOptionFactory

Classes

• ConflictContext
• ConflictDescription
• ConflictOption
• CustomConflictOption
• Messages
• VisualConflict

Enums

• ConflictOption.OptionType