Package com.intellij.diff.util

Class MergeConflictType

java.lang.Object

com.intellij.diff.util.MergeConflictType

public class MergeConflictType
extends java.lang.Object

Constructor Summary

Constructors

Constructor and Description
MergeConflictType(TextDiffType type, boolean leftChange, boolean rightChange)
MergeConflictType(TextDiffType type, boolean leftChange, boolean rightChange, boolean canBeResolved)

Method Summary

Modifier and Type	Method and Description
boolean	canBeResolved()
TextDiffType	getDiffType()
boolean	isChange(Side side)
boolean	isChange(ThreeSide side)

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

MergeConflictType

public MergeConflictType(TextDiffType type,
                         boolean leftChange,
                         boolean rightChange)

MergeConflictType

public MergeConflictType(TextDiffType type,
                         boolean leftChange,
                         boolean rightChange,
                         boolean canBeResolved)

Method Detail

getDiffType

public TextDiffType getDiffType()

canBeResolved

public boolean canBeResolved()

isChange

public boolean isChange(Side side)

isChange

public boolean isChange(ThreeSide side)