aboutsummaryrefslogtreecommitdiff
path: root/node_modules/simple-git/src/lib/tasks/merge.d.ts
diff options
context:
space:
mode:
Diffstat (limited to 'node_modules/simple-git/src/lib/tasks/merge.d.ts')
-rw-r--r--node_modules/simple-git/src/lib/tasks/merge.d.ts4
1 files changed, 4 insertions, 0 deletions
diff --git a/node_modules/simple-git/src/lib/tasks/merge.d.ts b/node_modules/simple-git/src/lib/tasks/merge.d.ts
new file mode 100644
index 0000000..663e80b
--- /dev/null
+++ b/node_modules/simple-git/src/lib/tasks/merge.d.ts
@@ -0,0 +1,4 @@
+import { MergeResult } from '../../../typings';
+import { StringTask } from '../types';
+import { EmptyTask } from './task';
+export declare function mergeTask(customArgs: string[]): EmptyTask | StringTask<MergeResult>;