MarkerLabels

tcmts.cli.merge.MarkerLabels · #blysos6n · type

How a conflict's three parts are labelled between its markers.

export interface MarkerLabels {
  ours: string;
  base: string;
  theirs: string;
}

used by

• tcmts.cli.merge.mergeLines
• tcmts.cli.merge.mergeScratch
• tcmts.cli.merge.mergeShown