On the 'resolve-incoming-add' branch:
On the 'resolve-incoming-add' branch:

* subversion/libsvn_client/conflicts.c
  (diff_dir_added): Skip adding the root of the added tree itself.
   The tree's root directory already exists in the working copy.


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

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