# HG changeset patch
# User Erik Zielke <ez@aragost.com>
# Date 2011-02-09 12:37:21
# Node ID fa921dcd9993ef92df2b1218508c2ca59df24ef8
# Parent  58c497d0e44db1f5bd0c5301effdb4e47dc3102c

subrepo: remove argument introduced by mistake in c19b9282d3a7

diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -269,7 +269,7 @@ class abstractsubrepo(object):
         """
         raise NotImplementedError
 
-    def merge(self, state, overwrite=False):
+    def merge(self, state):
         """merge currently-saved state with the new state."""
         raise NotImplementedError