Mercurial > hg

changeset 13413:fa921dcd9993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: remove argument introduced by mistake in c19b9282d3a7
author Erik Zielke <ez@aragost.com>
date Wed, 09 Feb 2011 13:37:21 +0100
parents 58c497d0e44d
children a0e49e129151
files mercurial/subrepo.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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