Use svn_wc_conflict_description3_t throughout the 'svn' command line client.

* subversion/svn/cl-conflicts.c
  (svn_cl__get_human_readable_prop_conflict_description,
   svn_cl__get_human_readable_tree_conflict_description,
   append_tree_conflict_info_xml, svn_cl__append_conflict_info_xml): Use
    svn_wc_conflict_description3_t instead of svn_wc_conflict_description2_t.

* subversion/svn/cl-conflicts.h

  (svn_cl__get_human_readable_prop_conflict_description,
   svn_cl__get_human_readable_tree_conflict_description,
   svn_cl__append_conflict_info_xml): Update declarations to use
   svn_wc_conflict_description3_t.

* subversion/svn/cl.h
  (svn_cl__conflict_func_interactive): Update declaration to use
   svn_wc_conflict_description3_t.

* subversion/svn/conflict-callbacks.c
  (show_diff, show_conflicts, merge_prop_conflict, show_prop_conflict,
   edit_prop_conflict, handle_tree_conflict, handle_prop_conflict,
   handle_tree_conflict, handle_obstructed_add, conflict_func_interactive):
   Use svn_wc_conflict_description3_t instead of svn_wc_conflict_description2_t.
   In handle_prop_conflict() we can drop a workaround that was necessary with
   the old conflict descriptor.

* subversion/svn/info-cmd.c
   (print_info_xml, print_info): Use svn_wc_conflict_description3_t instead of
    svn_wc_conflict_description2_t.

* subversion/svn/status.c
   (print_status): Update caller.


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