|
|||||||||
PREV PACKAGE NEXT PACKAGE | FRAMES NO FRAMES |
Interface Summary | |
---|---|
ConflictHandler | Allows to hook in for custom conflict treatment. |
ConflictResolver | Represents a controller that can merge conflicting changes resulting in a list of changes that is not conflicting any more. |
Class Summary | |
---|---|
AbstractConflictResolver | Convenience super class for implementing ConflictResolver . |
DecisionManager | DecisionManager is the controller for the merge dialog and therefore it's main component. |
Messages | Merging related messages. |
|
|||||||||
PREV PACKAGE NEXT PACKAGE | FRAMES NO FRAMES |