# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1165449525 21600
# Node ID e3ba19ec8c48370edce21ccb0d5b17b35f4b581d
# Parent  120be84f33de50f12eb8d65191ed825eb65085b6
Remove date parameter from merge

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1597,7 +1597,7 @@ def manifest(ui, repo, rev=None):
             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