Package org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui

Interface Summary

DescriptionComponent	Merge component showing a description of the conflict.
MergeComponent	Interface for a singe merge component.
OptionComponent	Merge component showing an option for resolving a conflict.

Class Summary

DecisionBox	Generic container for conflicts.
DescriptionComponentImpl	Displays the description in the decision box.
Messages
OptionComponentImpl	This component of the decision box dynamically displays the possible options.