|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
public interface MergeResult
Method Summary | |
---|---|
java.lang.String |
getMergedContent()
Returns the result of the merge. |
boolean |
hasConflicts()
True if the merge failed. |
Method Detail |
---|
boolean hasConflicts()
java.lang.String getMergedContent()
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |