|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Object com.atlassian.confluence.util.diffs.SimpleMergeResult
public class SimpleMergeResult
Field Summary | |
---|---|
static MergeResult |
FAIL_MERGE_RESULT
|
Constructor Summary | |
---|---|
SimpleMergeResult(boolean conflicts,
java.lang.String mergedContent)
|
Method Summary | |
---|---|
java.lang.String |
getMergedContent()
Returns the result of the merge. |
boolean |
hasConflicts()
True if the merge failed. |
Methods inherited from class java.lang.Object |
---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Field Detail |
---|
public static final MergeResult FAIL_MERGE_RESULT
Constructor Detail |
---|
public SimpleMergeResult(boolean conflicts, java.lang.String mergedContent)
Method Detail |
---|
public java.lang.String getMergedContent()
MergeResult
getMergedContent
in interface MergeResult
public boolean hasConflicts()
MergeResult
hasConflicts
in interface MergeResult
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |