blob: 519e95495e6c457a307bb62d46ca9270b8637734 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
|
import { MergeConflict, MergeConflictDeletion, MergeDetail, MergeResultStatus } from '../../../typings';
export declare class MergeSummaryConflict implements MergeConflict {
readonly reason: string;
readonly file: string | null;
readonly meta?: MergeConflictDeletion | undefined;
constructor(reason: string, file?: string | null, meta?: MergeConflictDeletion | undefined);
toString(): string;
}
export declare class MergeSummaryDetail implements MergeDetail {
conflicts: MergeConflict[];
merges: string[];
result: MergeResultStatus;
get failed(): boolean;
get reason(): string;
toString(): string;
}
|