Added MergeFileOptions

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';

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;
+}

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",