diff -r 47fb4beb992b -r 30789efb1e5e mercurial/mdiff.py
--- a/mercurial/mdiff.py	Sat Jun 25 17:40:53 2016 -0700
+++ b/mercurial/mdiff.py	Sat Jun 25 13:52:46 2016 -0700
@@ -58,10 +58,8 @@
         'upgrade': False,
         }
 
-    __slots__ = defaults.keys()
-
     def __init__(self, **opts):
-        for k in self.__slots__:
+        for k in self.defaults.keys():
             v = opts.get(k)
             if v is None:
                 v = self.defaults[k]