export interface ConflictBlock {
    file: string;
    start: number;
    sep: number;
    end: number;
    baseSep?: number;
    ours: string[];
    theirs: string[];
    base: string[];
}
export declare function parseConflictBlocks(file: string, text: string): ConflictBlock[];
export declare function registerConflictBlocks(cwd: string, blocks: ConflictBlock[]): void;
/** All conflict blocks a prior `read …:conflicts` registered for this cwd, in read order. */
export declare function getRegisteredConflictBlocks(cwd: string): ConflictBlock[];
export declare function getRegisteredConflictBlock(cwd: string, id: number): ConflictBlock | undefined;
//# sourceMappingURL=conflict-registry.d.ts.map