From 511959a4a7ebffbf3ac56ccd1048242d6f6b40ac Mon Sep 17 00:00:00 2001
From: Ilya Mochalov <chrootsu@gmail.com>
Date: Mon, 19 Oct 2015 06:34:46 +0500
Subject: [PATCH] utils-merge: definition of the module has been added

---
 utils-merge/utils-merge-tests.ts |  9 +++++++++
 utils-merge/utils-merge.d.ts     | 10 ++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 utils-merge/utils-merge-tests.ts
 create mode 100644 utils-merge/utils-merge.d.ts

diff --git a/utils-merge/utils-merge-tests.ts b/utils-merge/utils-merge-tests.ts
new file mode 100644
index 000000000..b4a4a1487
--- /dev/null
+++ b/utils-merge/utils-merge-tests.ts
@@ -0,0 +1,9 @@
+/// <reference path="./utils-merge.d.ts" />
+
+import merge from "utils-merge";
+
+type Result = {a: string, b: number};
+
+let result: Result;
+
+result = merge<{a: string}, {b: number}, Result>({a: ''}, {b: 42});
diff --git a/utils-merge/utils-merge.d.ts b/utils-merge/utils-merge.d.ts
new file mode 100644
index 000000000..0cb7f2522
--- /dev/null
+++ b/utils-merge/utils-merge.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for utils-merge
+// Project: https://github.com/jaredhanson/utils-merge
+// Definitions by: Ilya Mochalov <https://github.com/chrootsu>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "utils-merge" {
+	function merge<TA, TB, TResult>(a: TA, b: TB): TResult;
+
+	export default merge;
+}