From 67647327f3dfb7d2d80af259518173d94c0e4044 Mon Sep 17 00:00:00 2001
From: Yihe Dong <yihed@wolfram.com>
Date: Sun, 25 Feb 2018 15:08:33 -0600
Subject: [PATCH 1/2] actually resolving the merge conflict correctly

---
 base/abstractset.jl | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/base/abstractset.jl b/base/abstractset.jl
index 8291adf517922..57b09039630ea 100644
--- a/base/abstractset.jl
+++ b/base/abstractset.jl
@@ -215,6 +215,16 @@ false
 ```
 """
 function issubset(l, r)
+
+    rlen = length(r)
+    #This threshold was empirically determined by repeatedly
+    #sampling using these two methods.
+    lenthresh = 70
+
+    if rlen > lenthresh && !isa(r, Set)
+       return issubset(l, Set(r))
+    end
+
     for elt in l
         if !in(elt, r)
             return false

From 2ea5fa6dcb129d1795e6c65981ab090047d04c46 Mon Sep 17 00:00:00 2001
From: Yihe Dong <yihed@wolfram.com>
Date: Tue, 27 Feb 2018 23:04:33 -0600
Subject: [PATCH 2/2] update Set to AbstractSet to cover all Sets, per Jeff's
 suggestion

---
 base/abstractset.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/abstractset.jl b/base/abstractset.jl
index 57b09039630ea..2e81f258cb737 100644
--- a/base/abstractset.jl
+++ b/base/abstractset.jl
@@ -221,7 +221,7 @@ function issubset(l, r)
     #sampling using these two methods.
     lenthresh = 70
 
-    if rlen > lenthresh && !isa(r, Set)
+    if rlen > lenthresh && !isa(r, AbstractSet)
        return issubset(l, Set(r))
     end