--- a/mercurial/commands.py	Wed Dec 06 17:58:09 2006 -0600
+++ b/mercurial/commands.py	Wed Dec 06 17:58:45 2006 -0600
@@ -1597,7 +1597,7 @@
             ui.write("%3s " % (m.execf(f) and "755" or "644"))
         ui.write("%s\n" % f)
 
-def merge(ui, repo, node=None, force=None, branch=None, date=None):
+def merge(ui, repo, node=None, force=None, branch=None):
     """Merge working directory with another revision
 
     Merge the contents of the current working directory and the