From 3aa8f88a1c1026ebd6078b15e49500e5911f600b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 22 Dec 2014 21:12:24 -0500
Subject: [PATCH] fix #652 events/watch merging

---
 src/util/merge-option.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/util/merge-option.js b/src/util/merge-option.js
index 045f3af97d..864576183c 100644
--- a/src/util/merge-option.js
+++ b/src/util/merge-option.js
@@ -170,6 +170,9 @@ strats.events = function (parentVal, childVal) {
   for (var key in childVal) {
     var parent = ret[key]
     var child = childVal[key]
+    if (!_.isArray(parent)) {
+      parent = [parent]
+    }
     ret[key] = parent
       ? parent.concat(child)
       : [child]