* subversion/libsvn_client/resolved.c   (svn_client_conflict_tree_get_resolution_options): Always add an option    which allows the user to accept the current working copy state. This option    was not added if automated resolution is possible, but it needs to be    always available so that '--accept working' can function.
* subversion/libsvn_client/resolved.c
  (svn_client_conflict_tree_get_resolution_options): Always add an option
   which allows the user to accept the current working copy state. This option
   was not added if automated resolution is possible, but it needs to be
   always available so that '--accept working' can function.


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

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