Package com.intellij.diff.merge

Class TextMergeChange.State

java.lang.Object

com.intellij.diff.merge.MergeModelBase.State

com.intellij.diff.merge.TextMergeChange.State

Enclosing class:

TextMergeChange

public static class TextMergeChange.State
extends MergeModelBase.State

Field Summary

Fields inherited from class com.intellij.diff.merge.MergeModelBase.State

myEndLine, myIndex, myStartLine

Constructor Summary

Constructors

Constructor and Description
State(int index, int startLine, int endLine, boolean resolved1, boolean resolved2, boolean onesideAppliedConflict)

Method Summary

Methods inherited from class java.lang.Object

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

Constructor Detail

State

public State(int index,
             int startLine,
             int endLine,
             boolean resolved1,
             boolean resolved2,
             boolean onesideAppliedConflict)