Index: subversion/tests/cmdline/tree_conflict_tests.py =================================================================== --- subversion/tests/cmdline/tree_conflict_tests.py (revision 1868264) +++ subversion/tests/cmdline/tree_conflict_tests.py (working copy) @@ -1544,7 +1544,7 @@ contents = open(sbox.ospath('A1/B/lambda'), 'rb').readlines() svntest.verify.compare_and_display_lines( "A1/B/lambda has unexpectected contents", sbox.ospath("A1/B/lambda"), - [ "This is the file 'lambda'.\n", "This is more content.\n"], contents) + [ b"This is the file 'lambda'.\n", b"This is more content.\n"], contents) #######################################################################