Clean up some WC conflict handling code. No functional change.

* subversion/libsvn_wc/conflicts.c
  (resolve_text_conflict_on_node,
   resolve_prop_conflict_on_node): Add a doc string. Rename 'did_resolve' to
    'removed_reject_files' for clarity. Move outputs to the beginning of the
    parameter list. Remove unused parameters.
  (resolve_tree_conflict_on_node): Add a doc string. Move outputs to the
    beginning of the parameter list. Remove the 'did_resolve' output as it
    was always set and therefore unnecessary.
  (resolve_conflict_on_node): Adjust the caller accordingly.
  (conflict_status_walker): Note a bug.


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