From 01160246e4a0c0052181c72a53737e356ea7d02d Mon Sep 17 00:00:00 2001
From: Minteck <contact@minteck.org>
Date: Sat, 12 Feb 2022 10:33:06 +0100
Subject: First commit

---
 .../simple-git/src/lib/responses/MergeSummary.d.ts       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 node_modules/simple-git/src/lib/responses/MergeSummary.d.ts

(limited to 'node_modules/simple-git/src/lib/responses/MergeSummary.d.ts')

diff --git a/node_modules/simple-git/src/lib/responses/MergeSummary.d.ts b/node_modules/simple-git/src/lib/responses/MergeSummary.d.ts
new file mode 100644
index 0000000..519e954
--- /dev/null
+++ b/node_modules/simple-git/src/lib/responses/MergeSummary.d.ts
@@ -0,0 +1,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;
+}
-- 
cgit