##// END OF EJS Templates
vcs: add missing parameters to base class method.
marcink -
r923:d3bcf7c2 default
parent child Browse files
Show More
@@ -421,7 +421,7 b' class BaseRepository(object):'
421
421
422 def _merge_repo(self, shadow_repository_path, target_ref,
422 def _merge_repo(self, shadow_repository_path, target_ref,
423 source_repo, source_ref, merge_message,
423 source_repo, source_ref, merge_message,
424 merger_name, merger_email, dry_run=False):
424 merger_name, merger_email, dry_run=False, use_rebase=False):
425 """Internal implementation of merge."""
425 """Internal implementation of merge."""
426 raise NotImplementedError
426 raise NotImplementedError
427
427
General Comments 0
You need to be logged in to leave comments. Login now