commit ef4ae84b2181757999c16910718650d5d987e49e
author Stefan Sperling <stsp@apache.org> Mon Jul 25 12:47:58 2016 +0000
committer Stefan Sperling <stsp@apache.org> Mon Jul 25 12:47:58 2016 +0000
tree 93f5728b550796ba458a2afe18ff5f3d7b795c8e
parent c545b5f53fdfe0b7037a2025a3f521ddc92549c1

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.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1753987 13f79535-47bb-0310-9956-ffa450edef68