|
|||||||||
PREV NEXT | FRAMES NO FRAMES |
Classes in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict used by org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging | |
---|---|
VisualConflict
Main class representing a conflict. |
Classes in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict used by org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict | |
---|---|
ConflictContext
Holding the data for the context of an conflict. |
|
ConflictDescription
Container for the conflict description. |
|
ConflictOption
This class represents an option/solution for a conflict. |
|
ConflictOption.OptionType
Type of options. |
|
CustomConflictOption
Abstract superclass for custom options. |
|
VisualConflict
Main class representing a conflict. |
Classes in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict used by org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.conflicts | |
---|---|
VisualConflict
Main class representing a conflict. |
Classes in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict used by org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.options | |
---|---|
ConflictOption
This class represents an option/solution for a conflict. |
Classes in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict used by org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.util | |
---|---|
ConflictOption
This class represents an option/solution for a conflict. |
|
ConflictOption.OptionType
Type of options. |
|
VisualConflict
Main class representing a conflict. |
Classes in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict used by org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui | |
---|---|
ConflictOption
This class represents an option/solution for a conflict. |
|
VisualConflict
Main class representing a conflict. |
Classes in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict used by org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui.components | |
---|---|
ConflictOption
This class represents an option/solution for a conflict. |
|
VisualConflict
Main class representing a conflict. |
Classes in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict used by org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui.widgets | |
---|---|
ConflictOption
This class represents an option/solution for a conflict. |
|
|||||||||
PREV NEXT | FRAMES NO FRAMES |