From 1709b956a626ee47e1620dd2db3e9170776ddb22 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 10 2016 14:54:24 +0000
Subject: Adjust unit-tests for the always_merge setting change


---

diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py
index 2615f6e..38c026b 100644
--- a/tests/test_pagure_lib_git.py
+++ b/tests/test_pagure_lib_git.py
@@ -691,7 +691,7 @@ new file mode 100644
 index 0000000..60f7480
 --- /dev/null
 +++ b/456
-@@ -0,0 +1,78 @@
+@@ -0,0 +1,80 @@
 +{
 +    "assignee": null,
 +    "branch": "master",
@@ -714,6 +714,7 @@ index 0000000..60f7480
 +            "Minimum_score_to_merge_pull-request": -1,
 +            "Only_assignee_can_merge_pull-request": false,
 +            "Web-hooks": null,
++            "always_merge": false,
 +            "issue_tracker": true,
 +            "project_documentation": true,
 +            "pull_requests": true
@@ -741,6 +742,7 @@ index 0000000..60f7480
 +            "Minimum_score_to_merge_pull-request": -1,
 +            "Only_assignee_can_merge_pull-request": false,
 +            "Web-hooks": null,
++            "always_merge": false,
 +            "issue_tracker": true,
 +            "project_documentation": true,
 +            "pull_requests": true