| Log Message: |
Add conflict resolver regression test for 'incoming move dir merge' option.
* subversion/tests/libsvn_client/conflicts-test.c
(deleted_dir_name, deleted_dir_child): New global constants.
(new_dir_name): Move definition upwards in the file.
(create_wc_with_incoming_delete_dir_conflict): New test setup helper.
(test_merge_incoming_move_dir, test_funcs): New test.
|
subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c