* subversion/libsvn_wc/conflicts.c
  (resolve_tree_conflict_on_node): Some tree conflicts can now be resolved
   not just to 'working' but also to 'mine-conflict', so update error messages
   shown for invalid --accept arguments accordingly.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1449783 13f79535-47bb-0310-9956-ffa450edef68