From e8eb86fbb9a916fde11af9e5ce09cd8170aadf6b Mon Sep 17 00:00:00 2001
From: Hossein <hossein@databricks.com>
Date: Thu, 30 Jul 2015 19:14:45 -0700
Subject: [PATCH] Add a generic for merge

---
 R/pkg/R/generics.R | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/R/pkg/R/generics.R b/R/pkg/R/generics.R
index 36dd22ff395ca..ed382528bf486 100644
--- a/R/pkg/R/generics.R
+++ b/R/pkg/R/generics.R
@@ -461,6 +461,10 @@ setGeneric("isLocal", function(x) { standardGeneric("isLocal") })
 #' @export
 setGeneric("limit", function(x, num) {standardGeneric("limit") })
 
+#' rdname merge
+#' @export
+setGeneric("merge", function(x, ...) { standardGeneric("merge") })
+
 #' @rdname withColumn
 #' @export
 setGeneric("mutate", function(x, ...) {standardGeneric("mutate") })