aboutsummaryrefslogtreecommitdiff
path: root/node_modules/simple-git/src/lib/parsers/parse-merge.d.ts
diff options
context:
space:
mode:
Diffstat (limited to 'node_modules/simple-git/src/lib/parsers/parse-merge.d.ts')
-rw-r--r--node_modules/simple-git/src/lib/parsers/parse-merge.d.ts11
1 files changed, 11 insertions, 0 deletions
diff --git a/node_modules/simple-git/src/lib/parsers/parse-merge.d.ts b/node_modules/simple-git/src/lib/parsers/parse-merge.d.ts
new file mode 100644
index 0000000..42435fd
--- /dev/null
+++ b/node_modules/simple-git/src/lib/parsers/parse-merge.d.ts
@@ -0,0 +1,11 @@
+import { MergeDetail, MergeResult } from '../../../typings';
+import { TaskParser } from '../types';
+/**
+ * Parse the complete response from `git.merge`
+ */
+export declare const parseMergeResult: TaskParser<string, MergeResult>;
+/**
+ * Parse the merge specific detail (ie: not the content also available in the pull detail) from `git.mnerge`
+ * @param stdOut
+ */
+export declare const parseMergeDetail: TaskParser<string, MergeDetail>;