export interface ConflictBlock {
    localContent: string;
    remoteContent: string;
    startLine: number;
    endLine: number;
}
export declare function parseConflictBlocks(fileContent: string): ConflictBlock[];
export declare function resolveConflictBlock(fileContent: string, block: ConflictBlock, choice: 'local' | 'remote' | 'both'): string;
export declare function hasConflictMarkers(content: string): boolean;
export declare function showConflictResolutionMenu(): Promise<{
    resolved: boolean;
}>;
//# sourceMappingURL=conflict-resolution-menu.d.ts.map