Add anew resolver tests for merging a locally added directory which clashes with an incoming directory upon update, which tests behaviour with unversioned obstructions.
Add anew resolver tests for merging a locally added directory which clashes
with an incoming directory upon update, which tests behaviour with unversioned
obstructions.

* subversion/tests/libsvn_client/conflicts-test.c
  (test_update_incoming_added_dir_merge2, test_list): New test.


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

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