|
||||||||||
| PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
| SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD | |||||||||
public interface ConflictResolutionContributor
| Method Summary | |
|---|---|
java.util.Collection<ConflictResolution> |
getConflictResolutions(ConflictDescription conflictDescription,
ConflictResolutionOptions resolutionOptions)
Returns a list of contributed ConflictResolutions (eg, external
merge tools, internal merge tools, etc.) that are available to this
ConflictDescription. |
| Method Detail |
|---|
java.util.Collection<ConflictResolution> getConflictResolutions(ConflictDescription conflictDescription,
ConflictResolutionOptions resolutionOptions)
ConflictResolutions (eg, external
merge tools, internal merge tools, etc.) that are available to this
ConflictDescription.
conflictDescription - The ConflictDescription being resolvedresolutionOptions - The ConflictResolutionOptionss for this resolution
null)
|
||||||||||
| PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
| SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD | |||||||||