Add a failing test for "remote move vs local edit" tree conflict resolution upon merge with a moved directory that also contains a moved file.
Add a failing test for "remote move vs local edit" tree conflict resolution
upon merge with a moved directory that also contains a moved file.

While we can currently resolve the conflict on the directory by moving it,
then the conflict resolver doesn't see the file move that occured within
the directory.

* subversion/tests/libsvn_client/conflicts-test.c
  (test_merge_incoming_move_dir_with_moved_file): New failing test.
  (test_funcs): Reference new test.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1764130 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion