* subversion/tests/libsvn_client/conflicts-test.c
(test_cherry_pick_post_move_edit): Correct expectation of this XFAILing
test to make it easier to see what's really missing with this use case.
@@ -4634,7 +4634,6 @@ test_cherry_pick_post_move_edit(const svn_test_opts_t *opts,
svn_client_conflict_option_id_t expected_opts[] = {
svn_client_conflict_option_postpone,
svn_client_conflict_option_accept_current_wc_state,
- svn_client_conflict_option_local_move_file_text_merge,
-1 /* end of list */
};
SVN_ERR(assert_tree_conflict_options(conflict, ctx, expected_opts,
