From 96568ae6e3bcf8f37d44ff2b09447fd7fc5aecec Mon Sep 17 00:00:00 2001
From: Dolan <dolan_miu@hotmail.com>
Date: Wed, 7 Jun 2017 01:32:50 +0100
Subject: [PATCH] Added MergeFileOptions

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

diff --git a/types/nodegit/index.d.ts b/types/nodegit/index.d.ts
index a299e9c4bf..a8253f700f 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 { MergeFileOptions } from './merge-file-options';
 export { MergeFileResult } from './merge-file-result';
 export { MergeOptions } from './merge-options';
 export { Merge } from './merge';
diff --git a/types/nodegit/merge-file-options.d.ts b/types/nodegit/merge-file-options.d.ts
new file mode 100644
index 0000000000..5d8233bcd6
--- /dev/null
+++ b/types/nodegit/merge-file-options.d.ts
@@ -0,0 +1,8 @@
+export interface MergeFileOptions {
+    version: number;
+    ancestorLabel: string;
+    ourLabel: string;
+    theirLabel: string;
+    favor: number;
+    flags: number;
+}
diff --git a/types/nodegit/tsconfig.json b/types/nodegit/tsconfig.json
index 0e6b5c6daa..28a3d8e30b 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-options.d.ts",
         "merge-file-result.d.ts",
         "merge-options.d.ts",
         "merge.d.ts",