diff --git a/rhodecode/tests/functional/test_files.py b/rhodecode/tests/functional/test_files.py
--- a/rhodecode/tests/functional/test_files.py
+++ b/rhodecode/tests/functional/test_files.py
@@ -75,7 +75,7 @@ class TestFilesController(TestController
#test or history
response.mustcontain("""
""")
+
+""")
- response.mustcontain("""
Partially implemented #16. filecontent/commit message/author/node name are safe_unicode now.
-In addition some other __str__ are unicode as well
-Added test for unicode
-Improved test to clone into uniq repository.
-removed extra unicode conversion in diff.
""")
+ response.mustcontain("""
merge
""")
response.mustcontain("""branch: default""")
@@ -139,7 +136,7 @@ removed extra unicode conversion in diff
response.mustcontain("""
-""")
+""")
response.mustcontain("""branch: default""")