java.lang.Object | |
↳ | com.atlassian.confluence.util.diffs.SimpleMergeResult |
Fields | |||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
FAIL_MERGE_RESULT |
Public Constructors | |||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Public Methods | |||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Returns the result of the merge.
| |||||||||||
True if the merge failed.
|
[Expand]
Inherited Methods | |||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
From class java.lang.Object | |||||||||||||||
From interface
com.atlassian.confluence.util.diffs.MergeResult
|
Returns the result of the merge. If the merge resulted in a conflict this method may return null, or a partially merged string. Implementers should return the data in the same format as the one that was passed in.
True if the merge failed. If true is returned here the return value of getMergedContent() is undefined (likely null).