diff -r 6f4543842795 -r 213ca9ffcddb mercurial/context.py
--- a/mercurial/context.py	Fri May 07 10:59:11 2010 -0500
+++ b/mercurial/context.py	Fri May 07 14:07:30 2010 -0500
@@ -204,7 +204,7 @@
     def sub(self, path):
         return subrepo.subrepo(self, path)
 
-    def diff(self, ctx2=None, match=None, opts=None):
+    def diff(self, ctx2=None, match=None, **opts):
         """Returns a diff generator for the given contexts and matcher"""
         if ctx2 is None:
             ctx2 = self.p1()