From ebfb1064b10d18c07a7cf992a1a2f9756ecee1c5 Mon Sep 17 00:00:00 2001
From: Maxime LUCE <maxime.luce@somatic.fr>
Date: Thu, 22 Oct 2015 03:27:37 +0200
Subject: [PATCH] Fix gruntjs typings: Add grunt.config.merge method

---
 gruntjs/gruntjs.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gruntjs/gruntjs.d.ts b/gruntjs/gruntjs.d.ts
index 850d0b226..e503cb572 100644
--- a/gruntjs/gruntjs.d.ts
+++ b/gruntjs/gruntjs.d.ts
@@ -192,6 +192,12 @@ declare module grunt {
              */
             requires(prop: string, ...andProps: string[]): void
             requires(prop: string[], ...andProps: string[][]): void
+            
+            /**
+             * Recursively merges properties of the specified configObject into the current project configuration.
+             * You can use this method to append configuration options, targets, etc., to already defined tasks.
+             */
+            merge<T>(configObject: T): void;
         }
     }