* subversion/libsvn_client/resolved.c   (svn_client_conflict_tree_get_resolution_options): Fix the default    resolution option for tree conflicts so we don't run into the infamous    "tree conflicts may only be resolved to working" error when the default    option ("resolve") is used.
* subversion/libsvn_client/resolved.c
  (svn_client_conflict_tree_get_resolution_options): Fix the default
   resolution option for tree conflicts so we don't run into the infamous
   "tree conflicts may only be resolved to working" error when the default
   option ("resolve") is used.


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

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