Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: remove argument introduced by mistake in c19b9282d3a7
authorErik Zielke <ez@aragost.com>
Wed, 09 Feb 2011 13:37:21 +0100
changeset 13413 fa921dcd9993
parent 13412 58c497d0e44d
child 13414 a0e49e129151
subrepo: remove argument introduced by mistake in c19b9282d3a7
mercurial/subrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/subrepo.py	Thu Feb 03 10:31:17 2011 +0100
+++ b/mercurial/subrepo.py	Wed Feb 09 13:37:21 2011 +0100
@@ -269,7 +269,7 @@
         """
         raise NotImplementedError
 
-    def merge(self, state, overwrite=False):
+    def merge(self, state):
         """merge currently-saved state with the new state."""
         raise NotImplementedError
Mercurial