com.ibm.xtools.comparemerge.emf.delta.conflictanalyzer

Interfaces

• ConflictContainer
• ConflictStrategy

Classes

• AddAddConflictStrategy
• AddChangeConflictStrategy
• AddDeleteConflictStrategy
• ChangeChangeConflictStrategy
• ChangeDeleteConflictStrategy
• ChangeMoveConflictStrategy
• ConflictAnalyzer
• ConflictStrategyImpl
• ConflictStrategyRegistry
• DeleteDeleteConflictStrategy
• JoinDeleteConflictStrategy
• JoinJoinConflictStrategy
• MorphConflictStrategy
• MoveDeleteConflictStrategy
• MoveMoveConflictStrategy
• SeparationDeleteConflictStrategy
• SeparationSeparationConflictStrategy