Add a new conflict resolver test.
Add a new conflict resolver test.

This test verifies behaviour when resolving an 'add dir vs add dir' conflict
upon update by ignoring the incoming directory (effectively replacing it).

* subversion/tests/libsvn_client/conflicts-test.c
  (create_wc_with_dir_add_vs_dir_add_update_conflict): New helper function.
  (test_update_incoming_added_dir_ignore, test_funcs): New test.


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

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