* subversion/libsvn_wc/adm_ops.c   (resolve_found_entry_callback): For tree conflicts, there are no fancy    automatic resolution procedures. Those only work for text conflicts.    With tree conflicts, we only clear the conflict markers, leaving the    working state unmodified. So throw an error whenever people try to    'svn resolve' a tree conflict with --accept options other than 'working'.
* subversion/libsvn_wc/adm_ops.c
  (resolve_found_entry_callback): For tree conflicts, there are no fancy
   automatic resolution procedures. Those only work for text conflicts.
   With tree conflicts, we only clear the conflict markers, leaving the
   working state unmodified. So throw an error whenever people try to
   'svn resolve' a tree conflict with --accept options other than 'working'.


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

YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion