AbstractContentMerger.java

package jetbrains.mps.vcs.core.mergedriver;

/*Generated by MPS */

import org.jetbrains.annotations.Nullable;
import jetbrains.mps.baseLanguage.tuples.runtime.Tuples;

/*package*/ abstract class AbstractContentMerger {
  public static final int MERGED = 0;
  public static final int CONFLICTS = 1;
  public static final int FATAL_ERROR = 2;
  protected byte[] myConflictStart;
  protected byte[] myConflictEnd;
  protected byte[] mySeparator;
  /*package*/ AbstractContentMerger() {
  }
  public void setConflictMarks(byte[] conflictStart, byte[] conflictEnd, byte[] separator) {
    myConflictStart = conflictStart;
    myConflictEnd = conflictEnd;
    mySeparator = separator;
  }
  @Nullable
  public abstract Tuples._2<Integer, byte[]> mergeContents(FileContent baseContent, FileContent localContent, FileContent latestContent);
}