##// END OF EJS Templates
Remove date parameter from merge
Matt Mackall -
r3815:e3ba19ec default
parent child Browse files
Show More
@@ -1597,7 +1597,7 b' def manifest(ui, repo, rev=None):'
1597 ui.write("%3s " % (m.execf(f) and "755" or "644"))
1597 ui.write("%3s " % (m.execf(f) and "755" or "644"))
1598 ui.write("%s\n" % f)
1598 ui.write("%s\n" % f)
1599
1599
1600 def merge(ui, repo, node=None, force=None, branch=None, date=None):
1600 def merge(ui, repo, node=None, force=None, branch=None):
1601 """Merge working directory with another revision
1601 """Merge working directory with another revision
1602
1602
1603 Merge the contents of the current working directory and the
1603 Merge the contents of the current working directory and the
General Comments 0
You need to be logged in to leave comments. Login now