/**
 * Three-way merge logic for fork updates
 */
import type { MergeResult } from './types';
interface MergeInput {
    base: any;
    local: any;
    upstream: any;
}
/**
 * Perform three-way merge
 *
 * Strategy:
 * - If only upstream changed: take upstream
 * - If only local changed: keep local
 * - If both changed to same value: take either (no conflict)
 * - If both changed to different values: conflict!
 */
export declare function performMerge(input: MergeInput): Promise<MergeResult>;
/**
 * Resolve conflicts interactively or with strategy
 */
export declare function resolveConflicts(result: MergeResult, strategy?: 'local' | 'upstream' | 'manual'): MergeResult;
export {};
//# sourceMappingURL=merge.d.ts.map