Mercurial > hg

changeset 3815:e3ba19ec8c48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove date parameter from merge
author Matt Mackall <mpm@selenic.com>
date Wed, 06 Dec 2006 17:58:45 -0600
parents 120be84f33de
children 4f056896c093
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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