Uses of Class
com.atlassian.bitbucket.content.ConflictMarker

Packages that use ConflictMarker

Package	Description
com.atlassian.bitbucket.content

Uses of ConflictMarker in com.atlassian.bitbucket.content

Methods in com.atlassian.bitbucket.content that return ConflictMarker

Modifier and Type	Method and Description
ConflictMarker	DiffLine.getConflictMarker()
static ConflictMarker	ConflictMarker.valueOf(String name) Returns the enum constant of this type with the specified name.
static ConflictMarker[]	ConflictMarker.values() Returns an array containing the constants of this enum type, in the order they are declared.

Methods in com.atlassian.bitbucket.content with parameters of type ConflictMarker

Modifier and Type	Method and Description
void	DiffContentCallback.onSegmentLine(String line, ConflictMarker marker, boolean truncated) Called to process a line within the current segment.
void	AbstractDiffContentCallback.onSegmentLine(String line, ConflictMarker marker, boolean truncated)