public class FSMergerBySequence extends Object
Modifier and Type | Field and Description |
---|---|
static int |
CONFLICTED |
static String |
DEFAULT_EOL |
static int |
MERGED |
static int |
NOT_MODIFIED |
Constructor and Description |
---|
FSMergerBySequence(byte[] conflictStart,
byte[] conflictSeparator,
byte[] conflictEnd) |
FSMergerBySequence(byte[] conflictStart,
byte[] conflictSeparator,
byte[] conflictEnd,
byte[] originalMarker) |
Modifier and Type | Method and Description |
---|---|
int |
merge(de.regnis.q.sequence.line.QSequenceLineRAData baseData,
de.regnis.q.sequence.line.QSequenceLineRAData localData,
de.regnis.q.sequence.line.QSequenceLineRAData latestData,
SVNDiffOptions options,
OutputStream result,
SVNDiffConflictChoiceStyle style) |
public static final String DEFAULT_EOL
public static final int NOT_MODIFIED
public static final int MERGED
public static final int CONFLICTED
public FSMergerBySequence(byte[] conflictStart, byte[] conflictSeparator, byte[] conflictEnd)
public FSMergerBySequence(byte[] conflictStart, byte[] conflictSeparator, byte[] conflictEnd, byte[] originalMarker)
public int merge(de.regnis.q.sequence.line.QSequenceLineRAData baseData, de.regnis.q.sequence.line.QSequenceLineRAData localData, de.regnis.q.sequence.line.QSequenceLineRAData latestData, SVNDiffOptions options, OutputStream result, SVNDiffConflictChoiceStyle style) throws IOException
IOException
Copyright © 2019. All rights reserved.