aboutsummaryrefslogtreecommitdiff
path: root/node_modules/simple-git/src/lib/responses/MergeSummary.d.ts
diff options
context:
space:
mode:
Diffstat (limited to 'node_modules/simple-git/src/lib/responses/MergeSummary.d.ts')
-rw-r--r--node_modules/simple-git/src/lib/responses/MergeSummary.d.ts16
1 files changed, 0 insertions, 16 deletions
diff --git a/node_modules/simple-git/src/lib/responses/MergeSummary.d.ts b/node_modules/simple-git/src/lib/responses/MergeSummary.d.ts
deleted file mode 100644
index 519e954..0000000
--- a/node_modules/simple-git/src/lib/responses/MergeSummary.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-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;
-}