##// END OF EJS Templates
subrepo: remove argument introduced by mistake in c19b9282d3a7
Erik Zielke -
r13413:fa921dcd default
parent child Browse files
Show More
@@ -269,7 +269,7 class abstractsubrepo(object):
269 269 """
270 270 raise NotImplementedError
271 271
272 def merge(self, state, overwrite=False):
272 def merge(self, state):
273 273 """merge currently-saved state with the new state."""
274 274 raise NotImplementedError
275 275
General Comments 0
You need to be logged in to leave comments. Login now