import { ConflictResolverTypes, FileDiffMetadata, ProcessFileConflictData } from "../types.js";

//#region src/utils/resolveConflict.d.ts
declare function resolveConflict(diff: FileDiffMetadata, conflict: ProcessFileConflictData, type: ConflictResolverTypes): FileDiffMetadata;
//#endregion
export { resolveConflict };
//# sourceMappingURL=resolveConflict.d.ts.map