Add an XFAIL test for the 'incoming move dir merge' resolver option.
* subversion/tests/libsvn_client/conflicts-test.c
(modified_file_in_working_copy_content): New constant.
(create_wc_with_incoming_delete_dir_conflict): Add 'local_mod' paramter
which triggers a merge into a working copy with local modifications.
(test_merge_incoming_move_dir): Pass FALSE for new 'local_mod' parameter.
(test_merge_incoming_move_dir2): New XFAIL test. Tests the same situation as
test_merge_incoming_move_dir, but with a local mod in the working copy.
(test_funcs): Add new test.
git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1754024 13f79535-47bb-0310-9956-ffa450edef68
1 file changed
