From 84b0a535bbbf4b58bc8c983ca9f9491e2eecb937 Mon Sep 17 00:00:00 2001
From: Martin Bornhold <martin@rhodecode.com>
Date: Tue, 12 Jul 2016 11:09:35 +0200
Subject: [PATCH] tests: Fix a test that was broken due to changes around the
 rebase-merge option.

---
 rhodecode/tests/models/settings/test_vcs_settings.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rhodecode/tests/models/settings/test_vcs_settings.py b/rhodecode/tests/models/settings/test_vcs_settings.py
index 2ce878aa..6dd35aa9 100644
--- 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,
 }