UNPKG

@pierre/diffs

Version:

14 lines (13 loc) • 837 B
1
2
3
4
5
6
7
8
9
10
11
12
13
14
import { MergeConflictRegion } from "../types.js"; //#region src/utils/getMergeConflictLineTypes.d.ts type MergeConflictLineType = 'none' | 'marker-start' | 'marker-base' | 'marker-separator' | 'marker-end' | 'current' | 'base' | 'incoming'; interface MergeConflictParseResult { lineTypes: MergeConflictLineType[]; regions: MergeConflictRegion[]; } declare function getMergeConflictLineTypes(lines: string[]): MergeConflictLineType[]; declare function getMergeConflictParseResult(lines: string[]): MergeConflictParseResult; declare function getMergeConflictActionLineNumber(conflict: MergeConflictRegion): number; //#endregion export { MergeConflictLineType, MergeConflictParseResult, getMergeConflictActionLineNumber, getMergeConflictLineTypes, getMergeConflictParseResult }; //# sourceMappingURL=getMergeConflictLineTypes.d.ts.map