Fix issue #4238 "merge -cA,B with --accept option aborts if rA conflicts"
and several other conflict resolution issues identified along the way.

* subversion/include/svn_client.h
  (svn_client_resolve): Document the choice==unspecified case.

* subversion/libsvn_wc/conflicts.h
  (svn_wc__mark_resolved_prop_conflicts): New function.

* subversion/libsvn_wc/conflicts.c
  (generate_propconflict): Slightly simplify the code.
  (eval_text_conflict_func_result): Make 'mine-full' do the right thing:
    don't use the working file, as it might be the result of a merge attempt
    with conflict markers in it.
  (svn_wc__conflict_invoke_resolver): When marking conflicts as resolved,
    don't just mark them in the DB, do the proper dance that includes
    removing the conflict artifact files from disk.
  (resolve_conflict_on_node): Add some notes and a correction in the doc
    string.
  (svn_wc__mark_resolved_prop_conflicts): New function.

* subversion/libsvn_wc/merge.c
  (svn_wc_merge5): If we succeed in resolving conflicts, then reset
    the notification status to 'merged' rather than 'conflicted'.

* subversion/libsvn_wc/props.c
  (svn_wc_merge_props3): If we succeed in resolving conflicts, then reset
    the notification status to 'merged' rather than 'conflicted'.

* subversion/svn/conflict-callbacks.c
  (svn_cl__conflict_func_interactive): If we choose the 'working' state and
    no 'merged' value is available, which is common with property conflicts,
    then use 'mine'.

* subversion/svn/merge-cmd.c
  (svn_cl__merge): 

* subversion/tests/cmdline/merge_tests.py
  (expected_merge_output, svn_merge): Remove the 'resolved' parameter, as we
    no longer need it.
  (merge_two_edits_to_same_prop,
   merge_automatic_conflict_resolution): When conflicts are resolved,
    expect status 'U', instead of status 'C' followed by a 'Resolved'
    notification.

* subversion/tests/cmdline/resolve_tests.py
  (multi_range_merge_with_accept): Remove XFail.


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