|
||||||||||
PREV NEXT | FRAMES NO FRAMES |
Packages that use MergeResult | |
---|---|
com.atlassian.confluence.pages | |
com.atlassian.confluence.util.diffs |
Uses of MergeResult in com.atlassian.confluence.pages |
---|
Methods in com.atlassian.confluence.pages that return MergeResult | |
---|---|
MergeResult |
DraftManager.mergeContent(Draft draft)
Attempts the merge the changes done by this draft with the latest version of the content. |
MergeResult |
DefaultDraftManager.mergeContent(Draft draft)
Merges the draft with the original version compared to the latest version of the page. |
Uses of MergeResult in com.atlassian.confluence.util.diffs |
---|
Classes in com.atlassian.confluence.util.diffs that implement MergeResult | |
---|---|
class |
SimpleMergeResult
|
Fields in com.atlassian.confluence.util.diffs declared as MergeResult | |
---|---|
static MergeResult |
SimpleMergeResult.FAIL_MERGE_RESULT
|
Methods in com.atlassian.confluence.util.diffs that return MergeResult | |
---|---|
MergeResult |
PageLayoutAwareMerger.mergeContent(java.lang.String base,
java.lang.String left,
java.lang.String right)
|
MergeResult |
Merger.mergeContent(java.lang.String base,
java.lang.String left,
java.lang.String right)
Merge the content provided. |
|
||||||||||
PREV NEXT | FRAMES NO FRAMES |