Class FSMergerBySequence


  • public class FSMergerBySequence
    extends java.lang.Object
    Version:
    1.3
    Author:
    TMate Software Ltd.
    • Constructor Summary

      Constructors 
      Constructor Description
      FSMergerBySequence​(byte[] conflictStart, byte[] conflictSeparator, byte[] conflictEnd)  
      FSMergerBySequence​(byte[] conflictStart, byte[] conflictSeparator, byte[] conflictEnd, byte[] originalMarker)  
    • Method Summary

      All Methods Instance Methods Concrete Methods 
      Modifier and Type Method 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, java.io.OutputStream result, SVNDiffConflictChoiceStyle style)  
      • Methods inherited from class java.lang.Object

        clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    • Constructor Detail

      • FSMergerBySequence

        public FSMergerBySequence​(byte[] conflictStart,
                                  byte[] conflictSeparator,
                                  byte[] conflictEnd)
      • FSMergerBySequence

        public FSMergerBySequence​(byte[] conflictStart,
                                  byte[] conflictSeparator,
                                  byte[] conflictEnd,
                                  byte[] originalMarker)
    • Method Detail

      • merge

        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,
                         java.io.OutputStream result,
                         SVNDiffConflictChoiceStyle style)
                  throws java.io.IOException
        Throws:
        java.io.IOException