Factor out some conflict description code. No functional change.

* subversion/libsvn_wc/conflicts.c
  (resolve_text_conflict): Don't create create a conflict description here,
    take it as a parameter instead.
  (read_text_conflict_desc): New function, factored out of two places.
  (read_tree_conflict_desc): Renamed from 'setup_tree_conflict_desc'. Take
    the conflict skel and parse two parameters from it, so the two callers
    don't have to.
  (read_prop_conflict_descs): Renamed from 'read_prop_conflicts' for
    consistency.
  (svn_wc__conflict_invoke_resolver): Simplify by using the refactored code.
  (svn_wc__read_conflicts): Simplify by using the refactored code, and track
    the rename.


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