On the 'resolve-incoming-add' branch: Make an XFAIL test PASS.
On the 'resolve-incoming-add' branch: Make an XFAIL test PASS.

* subversion/tests/libsvn_client/conflicts-test.c
  (test_merge_incoming_added_dir_merge): Fix this test to account for the
   nested 'add vs add' conflict on the file which was added on both the
   trunk and the branch.
  (test_func): Mark the above test as PASS.


git-svn-id: 06eecb4ca38db91321c34a31bb4012790c9e075d@1764269 13f79535-47bb-0310-9956-ffa450edef68

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