# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2016-10-03 09:19:57
# Node ID d3bcf7c23294f917a47f40c847217a9d1d222785
# Parent  9a2bae5b3e0cd51a19b54e438becb2e6c74aa758

vcs: add missing parameters to base class method.

diff --git a/rhodecode/lib/vcs/backends/base.py b/rhodecode/lib/vcs/backends/base.py
--- 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