# HG changeset patch
# User Martin Bornhold <martin@rhodecode.com>
# Date 2016-07-12 09:09:35
# Node ID 381afb6c4bd58ac36cc4757d2fcd2ea2dedb5f0b
# Parent  5caecaf72f02b2785c696fe47cb5f3643a881ae4

tests: Fix a test that was broken due to changes around the rebase-merge option.

diff --git a/rhodecode/tests/models/settings/test_vcs_settings.py b/rhodecode/tests/models/settings/test_vcs_settings.py
--- a/rhodecode/tests/models/settings/test_vcs_settings.py
+++ b/rhodecode/tests/models/settings/test_vcs_settings.py
@@ -39,7 +39,8 @@ SVN_FORM_DATA = {
 
 GENERAL_FORM_DATA = {
     'rhodecode_pr_merge_enabled': True,
-    'rhodecode_use_outdated_comments': True
+    'rhodecode_use_outdated_comments': True,
+    'rhodecode_hg_use_rebase_for_merging': True,
 }