Fix wrong expectations of an XFAIL conflict resolver test.
* subversion/tests/libsvn_client/conflict-tests.c
(test_cherry_pick_post_move_edit): The cherry-pick merge as run by this
test results in a text conflict. Update test expectations accordingly.
@@ -4986,7 +4986,14 @@ test_cherry_pick_post_move_edit(const svn_test_opts_t *opts,
/* And "A1/mu" should have expected contents. */
SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A1/mu"), pool));
- SVN_TEST_STRING_ASSERT(buf->data, "More modified content." APR_EOL_STR);
+ SVN_TEST_STRING_ASSERT(buf->data,
+ "<<<<<<< .working" APR_EOL_STR
+ "This is the file 'mu'." APR_EOL_STR
+ "||||||| .old" APR_EOL_STR
+ "Modified content." APR_EOL_STR
+ "=======" APR_EOL_STR
+ "More modified content." APR_EOL_STR
+ ">>>>>>> .new" APR_EOL_STR);
return SVN_NO_ERROR;
}
