import Component from '../../component/consumer-component';
import Consumer from '../../consumer';
import { SourceFile } from '../../component/sources';
import { PathLinux } from '../../../utils/path';
export declare type MergeResultsTwoWay = {
    addFiles: Array<{
        filePath: PathLinux;
        otherFile: SourceFile;
    }>;
    modifiedFiles: Array<{
        filePath: PathLinux;
        otherFile: SourceFile;
        currentFile: SourceFile;
        output: string | null | undefined;
        conflict: string | null | undefined;
    }>;
    unModifiedFiles: Array<{
        filePath: PathLinux;
        currentFile: SourceFile;
    }>;
    hasConflicts: boolean;
};
declare const _default: ({ consumer, otherComponent, otherVersion, currentComponent, currentVersion }: {
    consumer: Consumer;
    otherComponent: Component;
    otherVersion: string;
    currentComponent: Component;
    currentVersion: string;
}) => Promise<MergeResultsTwoWay>;
export default _default;