From 98b385b76d86271b708d9ed0116004bfe60e2c98 Mon Sep 17 00:00:00 2001
From: Dolan <dolan_miu@hotmail.com>
Date: Wed, 7 Jun 2017 01:31:28 +0100
Subject: [PATCH] Added MergeFileResult

---
 types/nodegit/index.d.ts             | 1 +
 types/nodegit/merge-file-result.d.ts | 7 +++++++
 types/nodegit/tsconfig.json          | 1 +
 3 files changed, 9 insertions(+)
 create mode 100644 types/nodegit/merge-file-result.d.ts

diff --git a/types/nodegit/index.d.ts b/types/nodegit/index.d.ts
index 4f232c4cf7..a299e9c4bf 100644
--- a/types/nodegit/index.d.ts
+++ b/types/nodegit/index.d.ts
@@ -19,6 +19,7 @@ export { FetchOptions } from './fetch-options';
 export { Index } from './index_';
 export { IndexEntry } from './index-entry';
 export { MergeFileInput } from './merge-file-input';
+export { MergeFileResult } from './merge-file-result';
 export { MergeOptions } from './merge-options';
 export { Merge } from './merge';
 export { Note } from './note';
diff --git a/types/nodegit/merge-file-result.d.ts b/types/nodegit/merge-file-result.d.ts
new file mode 100644
index 0000000000..e6f2efcc3b
--- /dev/null
+++ b/types/nodegit/merge-file-result.d.ts
@@ -0,0 +1,7 @@
+export class MergeFileResult {
+    automergeable: number;
+    path: string;
+    mode: number;
+    ptr: string;
+    len: number;
+}
diff --git a/types/nodegit/tsconfig.json b/types/nodegit/tsconfig.json
index 32102a2de8..0e6b5c6daa 100644
--- a/types/nodegit/tsconfig.json
+++ b/types/nodegit/tsconfig.json
@@ -32,6 +32,7 @@
         "index-entry.d.ts",
         "index.d.ts",
         "merge-file-input.d.ts",
+        "merge-file-result.d.ts",
         "merge-options.d.ts",
         "merge.d.ts",
         "nodegit-tests.ts",