vcs: add missing parameters to base class method.

2016-10-03 11:19:57 +02:00 · 2016-10-03 11:19:57 +02:00 · 721295056f
commit 721295056f
parent 9a8665f0d8
1 changed files with 1 additions and 1 deletions
--- a/rhodecode/lib/vcs/backends/base.py
+++ b/rhodecode/lib/vcs/backends/base.py
@ -421,7 +421,7 @@ class BaseRepository(object):

    def _merge_repo(self, shadow_repository_path, target_ref,
                    source_repo, source_ref, merge_message,
-                    merger_name, merger_email, dry_run=False):
+                    merger_name, merger_email, dry_run=False, use_rebase=False):
        """Internal implementation of merge."""
        raise NotImplementedError